From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: Markus Armbruster <armbru@redhat.com>, qemu-devel@nongnu.org
Cc: "Paolo Bonzini" <pbonzini@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [PATCH v5 4/8] qapi: Restrict query-vm-generation-id command to machine code
Date: Sun, 13 Sep 2020 21:53:44 +0200 [thread overview]
Message-ID: <20200913195348.1064154-5-philmd@redhat.com> (raw)
In-Reply-To: <20200913195348.1064154-1-philmd@redhat.com>
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
allows pulling less declarations/definitions to 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>
---
qapi/machine.json | 20 ++++++++++++++++++++
qapi/misc.json | 21 ---------------------
hw/acpi/vmgenid.c | 2 +-
stubs/vmgenid.c | 2 +-
4 files changed, 22 insertions(+), 23 deletions(-)
diff --git a/qapi/machine.json b/qapi/machine.json
index 04f0a907c75..dd2815fa670 100644
--- a/qapi/machine.json
+++ b/qapi/machine.json
@@ -426,6 +426,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:
#
diff --git a/qapi/misc.json b/qapi/misc.json
index 7a14c50094d..edcc91e1060 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/hw/acpi/vmgenid.c b/hw/acpi/vmgenid.c
index 53db6af75d0..2c8152d5088 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/stubs/vmgenid.c b/stubs/vmgenid.c
index 568e42b0648..bfad656c6cc 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)
--
2.26.2
next prev parent reply other threads:[~2020-09-13 19:56 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-13 19:53 [PATCH v5 0/8] user-mode: Prune build dependencies (part 2) Philippe Mathieu-Daudé
2020-09-13 19:53 ` [PATCH v5 1/8] qapi: Restrict LostTickPolicy enum to machine code Philippe Mathieu-Daudé
2020-09-14 9:14 ` Markus Armbruster
2020-09-14 9:37 ` Philippe Mathieu-Daudé
2020-09-15 6:27 ` Markus Armbruster
2020-09-13 19:53 ` [PATCH v5 2/8] qapi: Correct balloon documentation Philippe Mathieu-Daudé
2020-09-13 19:53 ` [PATCH v5 3/8] qapi: Restrict balloon-related commands to machine code Philippe Mathieu-Daudé
2020-09-14 9:16 ` Markus Armbruster
2020-09-14 9:42 ` Philippe Mathieu-Daudé
2020-09-14 9:48 ` David Hildenbrand
2020-09-14 11:21 ` Markus Armbruster
2020-09-14 12:15 ` Philippe Mathieu-Daudé
2020-09-15 6:24 ` Markus Armbruster
2020-09-13 19:53 ` Philippe Mathieu-Daudé [this message]
2020-09-13 19:53 ` [PATCH v5 5/8] qapi: Restrict query-uuid command " Philippe Mathieu-Daudé
2020-09-13 19:53 ` [PATCH v5 6/8] qapi: Restrict device memory commands " Philippe Mathieu-Daudé
2020-09-13 19:53 ` [PATCH v5 7/8] qapi: Extract ACPI commands to 'acpi.json' Philippe Mathieu-Daudé
2020-09-13 19:53 ` [PATCH v5 8/8] qapi: Extract PCI commands to 'pci.json' Philippe Mathieu-Daudé
2020-09-15 6:29 ` [PATCH v5 0/8] user-mode: Prune build dependencies (part 2) Markus Armbruster
2020-09-15 7:09 ` Philippe Mathieu-Daudé
2020-09-15 8:52 ` 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=20200913195348.1064154-5-philmd@redhat.com \
--to=philmd@redhat.com \
--cc=armbru@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).