From: Igor Mammedov <imammedo@redhat.com>
To: qemu-devel@nongnu.org
Cc: ehabkost@redhat.com, mst@redhat.com, ghammer@redhat.com,
lersek@redhat.com, lcapitulino@redhat.com
Subject: [Qemu-devel] [PATCH v19 5/9] qmp/hmp: add query-vm-generation-id and 'info vm-generation-id' commands
Date: Thu, 28 Jan 2016 11:54:27 +0100 [thread overview]
Message-ID: <1453978470-222624-6-git-send-email-imammedo@redhat.com> (raw)
In-Reply-To: <1453978470-222624-1-git-send-email-imammedo@redhat.com>
Add commands to query Virtual Machine Generation ID counter.
QMP command example:
{ "execute": "query-vm-generation-id" }
HMP command example:
info vm-generation-id
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
v18:
- add a new QMP type GuidInfo instead of reusing UuidInfo
Eric Blake <eblake@redhat.com>
---
hmp-commands-info.hx | 13 +++++++++++++
hmp.c | 9 +++++++++
hmp.h | 1 +
hw/misc/vmgenid.c | 20 ++++++++++++++++++++
qapi-schema.json | 20 ++++++++++++++++++++
qmp-commands.hx | 19 +++++++++++++++++++
stubs/Makefile.objs | 1 +
stubs/vmgenid.c | 7 +++++++
8 files changed, 90 insertions(+)
create mode 100644 stubs/vmgenid.c
diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx
index 9b71351..b649a5d 100644
--- a/hmp-commands-info.hx
+++ b/hmp-commands-info.hx
@@ -787,6 +787,19 @@ Display the value of a storage key (s390 only)
ETEXI
STEXI
+@item info vm-generation-id
+Show Virtual Machine Generation ID
+ETEXI
+
+ {
+ .name = "vm-generation-id",
+ .args_type = "",
+ .params = "",
+ .help = "Show Virtual Machine Generation ID",
+ .mhandler.cmd = hmp_info_vm_generation_id,
+ },
+
+STEXI
@end table
ETEXI
diff --git a/hmp.c b/hmp.c
index 54f2620..aeb753d 100644
--- a/hmp.c
+++ b/hmp.c
@@ -2375,3 +2375,12 @@ void hmp_rocker_of_dpa_groups(Monitor *mon, const QDict *qdict)
qapi_free_RockerOfDpaGroupList(list);
}
+
+void hmp_info_vm_generation_id(Monitor *mon, const QDict *qdict)
+{
+ GuidInfo *info = qmp_query_vm_generation_id(NULL);
+ if (info) {
+ monitor_printf(mon, "%s\n", info->guid);
+ }
+ qapi_free_GuidInfo(info);
+}
diff --git a/hmp.h b/hmp.h
index a8c5b5a..21c5132 100644
--- a/hmp.h
+++ b/hmp.h
@@ -131,5 +131,6 @@ void hmp_rocker(Monitor *mon, const QDict *qdict);
void hmp_rocker_ports(Monitor *mon, const QDict *qdict);
void hmp_rocker_of_dpa_flows(Monitor *mon, const QDict *qdict);
void hmp_rocker_of_dpa_groups(Monitor *mon, const QDict *qdict);
+void hmp_info_vm_generation_id(Monitor *mon, const QDict *qdict);
#endif
diff --git a/hw/misc/vmgenid.c b/hw/misc/vmgenid.c
index a2fbdfc..24c0a4e 100644
--- a/hw/misc/vmgenid.c
+++ b/hw/misc/vmgenid.c
@@ -16,6 +16,7 @@
#include "hw/misc/vmgenid.h"
#include "hw/acpi/acpi.h"
#include "qapi/visitor.h"
+#include "qmp-commands.h"
#define VMGENID(obj) OBJECT_CHECK(VmGenIdState, (obj), VMGENID_DEVICE)
@@ -38,6 +39,25 @@ Object *find_vmgneid_dev(Error **errp)
return obj;
}
+GuidInfo *qmp_query_vm_generation_id(Error **errp)
+{
+ GuidInfo *info;
+ VmGenIdState *vdev;
+ Object *obj = find_vmgneid_dev(errp);
+
+ if (!obj) {
+ return NULL;
+ }
+ vdev = VMGENID(obj);
+ info = g_malloc0(sizeof(*info));
+ info->guid = g_strdup_printf(UUID_FMT, vdev->guid[0], vdev->guid[1],
+ vdev->guid[2], vdev->guid[3], vdev->guid[4], vdev->guid[5],
+ vdev->guid[6], vdev->guid[7], vdev->guid[8], vdev->guid[9],
+ vdev->guid[10], vdev->guid[11], vdev->guid[12], vdev->guid[13],
+ vdev->guid[14], vdev->guid[15]);
+ return info;
+}
+
static void vmgenid_update_guest(VmGenIdState *s)
{
Object *acpi_obj;
diff --git a/qapi-schema.json b/qapi-schema.json
index 8d04897..3f99549 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -4083,3 +4083,23 @@
##
{ 'enum': 'ReplayMode',
'data': [ 'none', 'record', 'play' ] }
+
+##
+# @GuidInfo:
+#
+# GUID information.
+#
+# @guid: the globally unique identifier
+#
+# Since: 2.6
+##
+{ 'struct': 'GuidInfo', 'data': {'guid': 'str'} }
+
+##
+# @query-vm-generation-id
+#
+# Show Virtual Machine Generation ID
+#
+# Since 2.6
+##
+{ 'command': 'query-vm-generation-id', 'returns': 'GuidInfo' }
diff --git a/qmp-commands.hx b/qmp-commands.hx
index db072a6..38e4e16 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -4795,3 +4795,22 @@ Example:
{"type": 0, "out-pport": 0, "pport": 0, "vlan-id": 3840,
"pop-vlan": 1, "id": 251658240}
]}
+
+EQMP
+
+ {
+ .name = "query-vm-generation-id",
+ .args_type = "",
+ .mhandler.cmd_new = qmp_marshal_query_vm_generation_id,
+ },
+
+SQMP
+Show Virtual Machine Generation ID counter
+-----
+
+Arguments: none
+
+Example:
+
+-> { "execute": "query-vm-generation-id" }
+<- {"return": {"guid": "324e6eaf-d1d1-4bf6-bf41-b9bb6c91fb87"}}
diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs
index d7898a0..c1ebfcc 100644
--- a/stubs/Makefile.objs
+++ b/stubs/Makefile.objs
@@ -38,3 +38,4 @@ stub-obj-y += qmp_pc_dimm_device_list.o
stub-obj-y += target-monitor-defs.o
stub-obj-y += target-get-monitor-def.o
stub-obj-y += vhost.o
+stub-obj-y += vmgenid.o
diff --git a/stubs/vmgenid.c b/stubs/vmgenid.c
new file mode 100644
index 0000000..1ff8cd2
--- /dev/null
+++ b/stubs/vmgenid.c
@@ -0,0 +1,7 @@
+#include "qmp-commands.h"
+
+GuidInfo *qmp_query_vm_generation_id(Error **errp)
+{
+ error_setg(errp, "this command is not currently supported");
+ return NULL;
+}
--
1.8.3.1
next prev parent reply other threads:[~2016-01-28 10:54 UTC|newest]
Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-28 10:54 [Qemu-devel] [PATCH v19 0/9] Virtual Machine Generation ID Igor Mammedov
2016-01-28 10:54 ` [Qemu-devel] [PATCH v19 1/9] acpi: extend ACPI interface to provide access to ACPI registers and SCI irq Igor Mammedov
2016-01-28 10:54 ` [Qemu-devel] [PATCH v19 2/9] docs: vm generation id device's description Igor Mammedov
2016-01-28 10:54 ` [Qemu-devel] [PATCH v19 3/9] pc: add a Virtual Machine Generation ID device Igor Mammedov
2016-01-28 11:13 ` Michael S. Tsirkin
2016-01-28 12:03 ` Igor Mammedov
2016-01-28 12:59 ` Michael S. Tsirkin
2016-01-29 11:13 ` Igor Mammedov
2016-01-31 16:22 ` Michael S. Tsirkin
2016-02-02 9:59 ` Igor Mammedov
2016-02-02 11:16 ` Michael S. Tsirkin
2016-02-09 10:46 ` Igor Mammedov
2016-02-09 12:17 ` Michael S. Tsirkin
2016-02-11 15:16 ` Igor Mammedov
2016-02-11 16:30 ` Michael S. Tsirkin
2016-02-11 17:34 ` Marcel Apfelbaum
2016-02-12 6:15 ` Michael S. Tsirkin
2016-02-15 10:30 ` Igor Mammedov
2016-02-15 11:26 ` Michael S. Tsirkin
2016-02-15 13:56 ` Igor Mammedov
2016-02-16 10:05 ` Marcel Apfelbaum
2016-02-16 12:17 ` Igor Mammedov
2016-02-16 12:36 ` Marcel Apfelbaum
2016-02-16 13:51 ` Igor Mammedov
2016-02-16 14:53 ` Michael S. Tsirkin
2016-02-16 15:10 ` Michael S. Tsirkin
2016-02-10 8:51 ` Michael S. Tsirkin
2016-02-10 9:28 ` Michael S. Tsirkin
2016-02-10 10:00 ` Laszlo Ersek
2016-01-28 13:48 ` Laszlo Ersek
2016-01-28 10:54 ` [Qemu-devel] [PATCH v19 4/9] tests: add a unit test for the vmgenid device Igor Mammedov
2016-01-28 10:54 ` Igor Mammedov [this message]
2016-02-09 17:31 ` [Qemu-devel] [PATCH v19 5/9] qmp/hmp: add query-vm-generation-id and 'info vm-generation-id' commands Eric Blake
2016-01-28 10:54 ` [Qemu-devel] [PATCH v19 6/9] qmp/hmp: add set-vm-generation-id commands Igor Mammedov
2016-02-09 17:33 ` Eric Blake
2016-01-28 10:54 ` [Qemu-devel] [PATCH v19 8/9] pc: put PIIX3 in slot 1 explicitly and cleanup functions assignment Igor Mammedov
2016-01-28 10:54 ` [Qemu-devel] [PATCH v19 9/9] pc/q53: by default put vmgenid device as an function of ISA bridge Igor Mammedov
2016-01-28 10:58 ` [Qemu-devel] [PATCH v19 7/9] machine: add properties to compat_props incrementaly Igor Mammedov
2016-01-28 14:02 ` Eduardo Habkost
2016-01-28 17:00 ` Igor Mammedov
2016-02-03 17:55 ` [Qemu-devel] qdev & hw/core owner? (was Re: [PATCH v19 7/9] machine: add properties to compat_props incrementaly) Eduardo Habkost
2016-02-03 18:46 ` Laszlo Ersek
2016-02-03 19:06 ` Michael S. Tsirkin
2016-02-04 11:31 ` Paolo Bonzini
2016-02-04 11:41 ` Andreas Färber
2016-02-04 11:55 ` Paolo Bonzini
2016-02-04 12:06 ` Michael S. Tsirkin
2016-02-05 7:49 ` Markus Armbruster
2016-02-05 7:51 ` Marcel Apfelbaum
2016-02-11 19:41 ` Eduardo Habkost
2016-02-12 9:17 ` Marcel Apfelbaum
2016-02-12 11:22 ` Andreas Färber
2016-02-12 18:17 ` Eduardo Habkost
2016-02-12 22:30 ` Paolo Bonzini
2016-02-12 18:09 ` Eduardo Habkost
2016-02-05 7:52 ` Markus Armbruster
2016-02-04 12:03 ` Michael S. Tsirkin
2016-02-04 12:12 ` Marcel Apfelbaum
2016-01-29 12:51 ` [Qemu-devel] [PATCH v19 7/9] machine: add properties to compat_props incrementaly Cornelia Huck
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=1453978470-222624-6-git-send-email-imammedo@redhat.com \
--to=imammedo@redhat.com \
--cc=ehabkost@redhat.com \
--cc=ghammer@redhat.com \
--cc=lcapitulino@redhat.com \
--cc=lersek@redhat.com \
--cc=mst@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).