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>
This commit is contained in:
parent
db0f08df59
commit
f68c01470b
@ -42,7 +42,7 @@
|
|||||||
#include "qemu/uuid.h"
|
#include "qemu/uuid.h"
|
||||||
#include "sysemu/replay.h"
|
#include "sysemu/replay.h"
|
||||||
#include "qapi/error.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/qdict.h"
|
||||||
#include "qapi/qmp/qstring.h"
|
#include "qapi/qmp/qstring.h"
|
||||||
#include "crypto/secret.h"
|
#include "crypto/secret.h"
|
||||||
|
@ -402,6 +402,36 @@
|
|||||||
##
|
##
|
||||||
{ 'command': 'query-target', 'returns': 'TargetInfo' }
|
{ '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:
|
# @GuidInfo:
|
||||||
#
|
#
|
||||||
|
@ -98,36 +98,6 @@
|
|||||||
##
|
##
|
||||||
{ 'command': 'query-kvm', 'returns': 'KvmInfo' }
|
{ '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:
|
# @IOThreadInfo:
|
||||||
#
|
#
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#include "qemu/osdep.h"
|
#include "qemu/osdep.h"
|
||||||
#include "qapi/qapi-commands-misc.h"
|
#include "qapi/qapi-commands-machine.h"
|
||||||
#include "qemu/uuid.h"
|
#include "qemu/uuid.h"
|
||||||
|
|
||||||
UuidInfo *qmp_query_uuid(Error **errp)
|
UuidInfo *qmp_query_uuid(Error **errp)
|
||||||
|
Loading…
Reference in New Issue
Block a user