diff options
| author | Philippe Mathieu-Daudé <philmd@redhat.com> | 2020-09-13 21:53:44 +0200 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2020-09-29 15:41:35 +0200 |
| commit | db0f08df597a71fbb8bd5fe0120aa52d86024774 (patch) | |
| tree | 5b2b934f01dacc4907dd96c3e5da94aebf1b796f | |
| parent | a83e24ba1a52e2f0a00239c8b79edafaa61515aa (diff) | |
| download | qemu-db0f08df597a71fbb8bd5fe0120aa52d86024774.zip | |
qapi: Restrict query-vm-generation-id 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-vm-generation-id command to machine.json pulls
less QAPI-generated code into user-mode.
Acked-by: Igor Mammedov <imammedo@redhat.com>
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-5-philmd@redhat.com>
[Commit message tweaked]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
| -rw-r--r-- | hw/acpi/vmgenid.c | 2 | ||||
| -rw-r--r-- | qapi/machine.json | 20 | ||||
| -rw-r--r-- | qapi/misc.json | 21 | ||||
| -rw-r--r-- | stubs/vmgenid.c | 2 |
4 files changed, 22 insertions, 23 deletions
diff --git a/hw/acpi/vmgenid.c b/hw/acpi/vmgenid.c index 53db6af75d..2c8152d508 100644 --- a/hw/acpi/vmgenid.c +++ b/hw/acpi/vmgenid.c @@ -12,7 +12,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qapi/qapi-commands-misc.h" +#include "qapi/qapi-commands-machine.h" #include "qemu/module.h" #include "hw/acpi/acpi.h" #include "hw/acpi/aml-build.h" diff --git a/qapi/machine.json b/qapi/machine.json index 2accb3c4d2..15c8d606ab 100644 --- a/qapi/machine.json +++ b/qapi/machine.json @@ -403,6 +403,26 @@ { 'command': 'query-target', 'returns': 'TargetInfo' } ## +# @GuidInfo: +# +# GUID information. +# +# @guid: the globally unique identifier +# +# Since: 2.9 +## +{ 'struct': 'GuidInfo', 'data': {'guid': 'str'} } + +## +# @query-vm-generation-id: +# +# Show Virtual Machine Generation ID +# +# Since: 2.9 +## +{ 'command': 'query-vm-generation-id', 'returns': 'GuidInfo' } + +## # @LostTickPolicy: # # Policy for handling lost ticks in timer devices. Ticks end up getting diff --git a/qapi/misc.json b/qapi/misc.json index 7a14c50094..edcc91e106 100644 --- a/qapi/misc.json +++ b/qapi/misc.json @@ -1479,24 +1479,3 @@ # ## { 'command': 'xen-load-devices-state', 'data': {'filename': 'str'} } - -## -# @GuidInfo: -# -# GUID information. -# -# @guid: the globally unique identifier -# -# Since: 2.9 -## -{ 'struct': 'GuidInfo', 'data': {'guid': 'str'} } - -## -# @query-vm-generation-id: -# -# Show Virtual Machine Generation ID -# -# Since: 2.9 -## -{ 'command': 'query-vm-generation-id', 'returns': 'GuidInfo' } - diff --git a/stubs/vmgenid.c b/stubs/vmgenid.c index 568e42b064..bfad656c6c 100644 --- a/stubs/vmgenid.c +++ b/stubs/vmgenid.c @@ -1,6 +1,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qapi/qapi-commands-misc.h" +#include "qapi/qapi-commands-machine.h" #include "qapi/qmp/qerror.h" GuidInfo *qmp_query_vm_generation_id(Error **errp) |