From: Markus Armbruster <armbru@redhat.com>
To: Eric Blake <eblake@redhat.com>
Cc: "Stefan Berger" <stefanb@linux.vnet.ibm.com>,
"Michael Roth" <michael.roth@amd.com>,
qemu-devel@nongnu.org,
"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: Re: [RFC PATCH v2 1/2] qapi: Inline qmp_marshal_output() functions
Date: Thu, 10 Jun 2021 11:33:34 +0200 [thread overview]
Message-ID: <87eedadpxt.fsf@dusky.pond.sub.org> (raw)
In-Reply-To: <20210609202952.r4nb2smrptyckvk2@redhat.com> (Eric Blake's message of "Wed, 9 Jun 2021 15:29:52 -0500")
Eric Blake <eblake@redhat.com> writes:
> On Wed, Jun 09, 2021 at 08:49:54PM +0200, Philippe Mathieu-Daudé wrote:
>> In case we need to use QAPI types but no QAPI command / QAPI event
>> actually use them, the generated qmp_marshal_output() function will
>> trigger the compiler 'unused-function' warnings.
>> To prevent that, emit these functions inlined: the compiler will
>> ignore such unused functions.
>>
>> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>> ---
>> RFC: No clue about QAPI...
>> Tested with GCC. If the compiler is picky we could use the 'unused'
>> function attribute.
>
> And I have no clue if clang will warn about an unused inline function.
> Going with the compiler attribute seems safer and just as easy to do
> in the same two-line change (remember, the "unused" attribute merely
> means "suppress warnings if I don't use this", and not "warn me if I
> use it in spite of calling it unused").
>
>> ---
>> scripts/qapi/commands.py | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/scripts/qapi/commands.py b/scripts/qapi/commands.py
>> index 0e13d510547..bbed776a909 100644
>> --- a/scripts/qapi/commands.py
>> +++ b/scripts/qapi/commands.py
>> @@ -91,8 +91,8 @@ def gen_call(name: str,
>> def gen_marshal_output(ret_type: QAPISchemaType) -> str:
>> return mcgen('''
>>
>> -static void qmp_marshal_output_%(c_name)s(%(c_type)s ret_in,
>> - QObject **ret_out, Error **errp)
>> +static inline void qmp_marshal_output_%(c_name)s(%(c_type)s ret_in,
>> + QObject **ret_out, Error **errp)
>
> On the other hand, the qapi generator is smart enough to only output
> introspection data for qapi types that were actually used by a command
> or event, so how is that working, and why is it not also being used to
> elide the generation of unused qmp_marshal_output_FOO functions? This
> is where I'll have to defer to Markus.
This is a QAPI generator restriction. Let me explain.
The qmp_marshal_output_T() are shared by all commands returning T.
The commands may be conditional. The user is responsible for making T's
'if' the conjunction of the commands'. See the FIXME in commands.py.
If I do this for tpm.json (appended), then tpm.h misses TpmModel when
CONFIG_TPM is off, and tpm_backend.h misses TpmType and TpmInfo. I
suspect more TPM code needs to be guarded by CONFIG_TPM.
diff --git a/qapi/tpm.json b/qapi/tpm.json
index 09332e6f99..e74c881ea6 100644
--- a/qapi/tpm.json
+++ b/qapi/tpm.json
@@ -17,7 +17,9 @@
#
# Since: 1.5
##
-{ 'enum': 'TpmModel', 'data': [ 'tpm-tis', 'tpm-crb', 'tpm-spapr' ] }
+{ 'enum': 'TpmModel', 'data': [ 'tpm-tis', 'tpm-crb', 'tpm-spapr' ],
+ 'if': 'defined(CONFIG_TPM)' }
+
##
# @query-tpm-models:
#
@@ -47,7 +49,8 @@
#
# Since: 1.5
##
-{ 'enum': 'TpmType', 'data': [ 'passthrough', 'emulator' ] }
+{ 'enum': 'TpmType', 'data': [ 'passthrough', 'emulator' ],
+ 'if': 'defined(CONFIG_TPM)' }
##
# @query-tpm-types:
@@ -124,7 +127,8 @@
{ 'struct': 'TPMInfo',
'data': {'id': 'str',
'model': 'TpmModel',
- 'options': 'TpmTypeOptions' } }
+ 'options': 'TpmTypeOptions' },
+ 'if': 'defined(CONFIG_TPM)' }
##
# @query-tpm:
next prev parent reply other threads:[~2021-06-10 9:35 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-09 18:49 [PATCH v2 0/2] tpm: Return QMP error when TPM is disabled in build Philippe Mathieu-Daudé
2021-06-09 18:49 ` [RFC PATCH v2 1/2] qapi: Inline qmp_marshal_output() functions Philippe Mathieu-Daudé
2021-06-09 20:29 ` Eric Blake
2021-06-10 9:33 ` Markus Armbruster [this message]
2021-06-10 10:06 ` Philippe Mathieu-Daudé
2021-06-10 11:06 ` Markus Armbruster
2021-06-10 15:59 ` Philippe Mathieu-Daudé
2021-06-11 8:02 ` Markus Armbruster
2021-06-11 12:32 ` Stefan Berger
2021-06-09 18:49 ` [PATCH v2 2/2] tpm: Return QMP error when TPM is disabled in build Philippe Mathieu-Daudé
2021-06-09 20:33 ` Eric Blake
2021-06-10 9:35 ` Markus Armbruster
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87eedadpxt.fsf@dusky.pond.sub.org \
--to=armbru@redhat.com \
--cc=dgilbert@redhat.com \
--cc=eblake@redhat.com \
--cc=michael.roth@amd.com \
--cc=pbonzini@redhat.com \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanb@linux.vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.