[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 6/9] qapi/misc: Restrict query-vm-generation-id command to machin
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 6/9] qapi/misc: Restrict query-vm-generation-id command to machine code |
Date: |
Fri, 13 Mar 2020 19:41:50 +0100 |
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
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 c096efbea3..1a2a4b0d48 100644
--- a/qapi/machine.json
+++ b/qapi/machine.json
@@ -415,6 +415,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 18cd0719f3..8e0902caf4 100644
--- a/qapi/misc.json
+++ b/qapi/misc.json
@@ -1351,24 +1351,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 2df7623d74..2b26bacaf8 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 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)
--
2.21.1
- [PATCH 0/9] user-mode: Prune build dependencies (part 2), Philippe Mathieu-Daudé, 2020/03/13
- [PATCH 1/9] target/i386: Restrict X86CPUFeatureWord to X86 targets, Philippe Mathieu-Daudé, 2020/03/13
- [PATCH 2/9] qapi/misc: Move add_client command with chardev code, Philippe Mathieu-Daudé, 2020/03/13
- [PATCH 3/9] qapi/misc: Restrict LostTickPolicy enum to machine code, Philippe Mathieu-Daudé, 2020/03/13
- [PATCH 4/9] qapi/misc: Restrict balloon-related commands to machine code, Philippe Mathieu-Daudé, 2020/03/13
- [PATCH 5/9] qapi/misc: Move query-uuid command with block code, Philippe Mathieu-Daudé, 2020/03/13
- [PATCH 6/9] qapi/misc: Restrict query-vm-generation-id command to machine code,
Philippe Mathieu-Daudé <=
- [PATCH 7/9] qapi/misc: Restrict ACPI commands to machine code, Philippe Mathieu-Daudé, 2020/03/13
- [PATCH 8/9] qapi/misc: Restrict PCI commands to machine code, Philippe Mathieu-Daudé, 2020/03/13
- [PATCH 9/9] qapi/misc: Restrict device memory commands to machine code, Philippe Mathieu-Daudé, 2020/03/13
- Re: [PATCH 0/9] user-mode: Prune build dependencies (part 2), no-reply, 2020/03/13
- Re: [PATCH 0/9] user-mode: Prune build dependencies (part 2), no-reply, 2020/03/13