From patchwork Thu Jan 28 10:54:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Mammedov X-Patchwork-Id: 8149201 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A338C9FBF9 for ; Thu, 28 Jan 2016 10:58:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DDF7920154 for ; Thu, 28 Jan 2016 10:58:14 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0CD2320320 for ; Thu, 28 Jan 2016 10:58:14 +0000 (UTC) Received: from localhost ([::1]:55272 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aOkHF-0008Er-I2 for patchwork-qemu-devel@patchwork.kernel.org; Thu, 28 Jan 2016 05:58:13 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35265) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aOkDu-0001zM-K8 for qemu-devel@nongnu.org; Thu, 28 Jan 2016 05:54:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aOkDr-0005Dn-NZ for qemu-devel@nongnu.org; Thu, 28 Jan 2016 05:54:46 -0500 Received: from mx1.redhat.com ([209.132.183.28]:53828) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aOkDr-0005Df-FP for qemu-devel@nongnu.org; Thu, 28 Jan 2016 05:54:43 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id 12DD5C0B66C4 for ; Thu, 28 Jan 2016 10:54:43 +0000 (UTC) Received: from dell-r430-03.lab.eng.brq.redhat.com (dell-r430-03.lab.eng.brq.redhat.com [10.34.112.60]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u0SAsUru001804; Thu, 28 Jan 2016 05:54:41 -0500 From: Igor Mammedov To: qemu-devel@nongnu.org Date: Thu, 28 Jan 2016 11:54:27 +0100 Message-Id: <1453978470-222624-6-git-send-email-imammedo@redhat.com> In-Reply-To: <1453978470-222624-1-git-send-email-imammedo@redhat.com> References: <1453978470-222624-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 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 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Reviewed-by: Eric Blake --- v18: - add a new QMP type GuidInfo instead of reusing UuidInfo Eric Blake --- 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; +}