diff options
| author | Philippe Mathieu-Daudé <philmd@redhat.com> | 2020-09-13 21:53:45 +0200 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2020-09-29 15:41:35 +0200 |
| commit | f68c01470b25d89fe4f48e2ecce77c78e42b62ca (patch) | |
| tree | b00e809ab7b9d829e3b564d956e3de2155476e33 | |
| parent | db0f08df597a71fbb8bd5fe0120aa52d86024774 (diff) | |
qapi: Restrict query-uuid command to machine code
Only qemu-system-FOO and qemu-storage-daemon provide QMP
monitors, therefore such declarations and definitions are
irrelevant for user-mode emulation.
Restricting the query-uuid command to machine.json pulls less
QAPI-generated code into user-mode.
Acked-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200913195348.1064154-6-philmd@redhat.com>
[Commit message tweaked]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
| -rw-r--r-- | block/iscsi.c | 2 | ||||
| -rw-r--r-- | qapi/machine.json | 30 | ||||
| -rw-r--r-- | qapi/misc.json | 30 | ||||
| -rw-r--r-- | stubs/uuid.c | 2 |
4 files changed, 32 insertions, 32 deletions
diff --git a/block/iscsi.c b/block/iscsi.c index bd2122a3a4..e30a7e3606 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -42,7 +42,7 @@ #include "qemu/uuid.h" #include "sysemu/replay.h" #include "qapi/error.h" -#include "qapi/qapi-commands-misc.h" +#include "qapi/qapi-commands-machine.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qstring.h" #include "crypto/secret.h" diff --git a/qapi/machine.json b/qapi/machine.json index 15c8d606ab..5e5ddd7a5e 100644 --- a/qapi/machine.json +++ b/qapi/machine.json @@ -403,6 +403,36 @@ { 'command': 'query-target', 'returns': 'TargetInfo' } ## +# @UuidInfo: +# +# Guest UUID information (Universally Unique Identifier). +# +# @UUID: the UUID of the guest +# +# Since: 0.14.0 +# +# Notes: If no UUID was specified for the guest, a null UUID is returned. +## +{ 'struct': 'UuidInfo', 'data': {'UUID': 'str'} } + +## +# @query-uuid: +# +# Query the guest UUID information. +# +# Returns: The @UuidInfo for the guest +# +# Since: 0.14.0 +# +# Example: +# +# -> { "execute": "query-uuid" } +# <- { "return": { "UUID": "550e8400-e29b-41d4-a716-446655440000" } } +# +## +{ 'command': 'query-uuid', 'returns': 'UuidInfo', 'allow-preconfig': true } + +## # @GuidInfo: # # GUID information. diff --git a/qapi/misc.json b/qapi/misc.json index edcc91e106..05db6295fe 100644 --- a/qapi/misc.json +++ b/qapi/misc.json @@ -99,36 +99,6 @@ { 'command': 'query-kvm', 'returns': 'KvmInfo' } ## -# @UuidInfo: -# -# Guest UUID information (Universally Unique Identifier). -# -# @UUID: the UUID of the guest -# -# Since: 0.14.0 -# -# Notes: If no UUID was specified for the guest, a null UUID is returned. -## -{ 'struct': 'UuidInfo', 'data': {'UUID': 'str'} } - -## -# @query-uuid: -# -# Query the guest UUID information. -# -# Returns: The @UuidInfo for the guest -# -# Since: 0.14.0 -# -# Example: -# -# -> { "execute": "query-uuid" } -# <- { "return": { "UUID": "550e8400-e29b-41d4-a716-446655440000" } } -# -## -{ 'command': 'query-uuid', 'returns': 'UuidInfo', 'allow-preconfig': true } - -## # @IOThreadInfo: # # Information about an iothread diff --git a/stubs/uuid.c b/stubs/uuid.c index 67f182fa3a..e5112eb3f6 100644 --- a/stubs/uuid.c +++ b/stubs/uuid.c @@ -1,5 +1,5 @@ #include "qemu/osdep.h" -#include "qapi/qapi-commands-misc.h" +#include "qapi/qapi-commands-machine.h" #include "qemu/uuid.h" UuidInfo *qmp_query_uuid(Error **errp) |