From patchwork Mon Jan 23 07:32:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ben@skyportsystems.com X-Patchwork-Id: 9531839 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E836860434 for ; Mon, 23 Jan 2017 07:35:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D78E727DCD for ; Mon, 23 Jan 2017 07:35:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C751427F0B; Mon, 23 Jan 2017 07:35:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 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.wl.linuxfoundation.org (Postfix) with ESMTPS id 1B6AF27DCD for ; Mon, 23 Jan 2017 07:35:35 +0000 (UTC) Received: from localhost ([::1]:39536 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cVZA6-0006LF-5C for patchwork-qemu-devel@patchwork.kernel.org; Mon, 23 Jan 2017 02:35:34 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34034) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cVZ8K-0005F9-GY for qemu-devel@nongnu.org; Mon, 23 Jan 2017 02:33:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cVZ8F-0006nn-JZ for qemu-devel@nongnu.org; Mon, 23 Jan 2017 02:33:44 -0500 Received: from mail-pf0-x22b.google.com ([2607:f8b0:400e:c00::22b]:35844) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cVZ8F-0006nZ-E0 for qemu-devel@nongnu.org; Mon, 23 Jan 2017 02:33:39 -0500 Received: by mail-pf0-x22b.google.com with SMTP id 189so39282730pfu.3 for ; Sun, 22 Jan 2017 23:33:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=skyportsystems.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=srqADs2jM0q7gArV7bmNbXfNsScVtp6gGw7hNLxOg9k=; b=gsBCHbTbHB5CfJdtO7tH3BG99v4woGYQdyFBhH3F0IVJCDblGPB6GAsx3IxefqCOcs uYhXWDeZepySFO7U5luUkLwqV07yrtdQBqQCn+ZiT3PZf9FqzQOAois4xiCFT6BrbopS 4Q1ogPUVPvcY+GGebsDUVrUiHS74+MYnsfrwk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=srqADs2jM0q7gArV7bmNbXfNsScVtp6gGw7hNLxOg9k=; b=BqxxnSsHS6sewVVmB3IzCEkefkczR/pSYKZx/6vvONXb0CYHCTO9mopNhWrRwjJ/a+ sTbyg45+s3aghjAusEW+7Y54TlRDU+TIL0fdslZ5EWVFnBQWXAFKWE38r6L+FFJGLf2J uDHxf9wV9iBdUFXK0a9rfJ8Qj5BSPYaHID1jJAHvYsnOuJ8xs/9oTwwQeTYdevC3TC2f fXoFt92y0HdbIWsoZ6/CdwTeAZ4WbhkO6TNqKHVph6Go/UftwKPkc3qDVRrZSY3Ke4gb AO2Cpy5yw+e5a7TZ2B9C4WFa71Bu16RFV1qklPBRkqymjES+OmzhOCVHxZh6aknHEuGX 7wTA== X-Gm-Message-State: AIkVDXKea8KAgNEvnvDULi9XaZVzOC898ms3h3q1lTLDFOAPEGPhZjLAG50PtgOX1e7T4DVU X-Received: by 10.84.209.204 with SMTP id y70mr41042509plh.180.1485156818306; Sun, 22 Jan 2017 23:33:38 -0800 (PST) Received: from Arrow.corp.skyportsystems.com (162-199-88-38.lightspeed.sntcca.sbcglobal.net. [162.199.88.38]) by smtp.gmail.com with ESMTPSA id d78sm34155810pfb.43.2017.01.22.23.33.37 (version=TLS1 cipher=AES128-SHA bits=128/128); Sun, 22 Jan 2017 23:33:37 -0800 (PST) From: ben@skyportsystems.com To: qemu-devel@nongnu.org Date: Sun, 22 Jan 2017 23:32:50 -0800 Message-Id: <9e1ebea9a611b67e1fcd80cb6f985679b62c820c.1485155611.git.ben@skyportsystems.com> X-Mailer: git-send-email 2.10.1 (Apple Git-78) In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400e:c00::22b Subject: [Qemu-devel] [PATCH v3 4/6] qmp/hmp: add query-vm-generation-id and 'info vm-generation-id' commands X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Igor Mammedov , Ben Warren Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Igor Mammedov 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 Signed-off-by: Ben Warren --- hmp-commands-info.hx | 13 +++++++++++++ hmp.c | 9 +++++++++ hmp.h | 1 + qapi-schema.json | 20 ++++++++++++++++++++ stubs/Makefile.objs | 1 + stubs/vmgenid.c | 8 ++++++++ 6 files changed, 52 insertions(+) create mode 100644 stubs/vmgenid.c diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx index 55d50c4..b0bb052 100644 --- a/hmp-commands-info.hx +++ b/hmp-commands-info.hx @@ -802,6 +802,19 @@ Show information about hotpluggable CPUs 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", + .cmd = hmp_info_vm_generation_id, + }, + +STEXI @end table ETEXI diff --git a/hmp.c b/hmp.c index 8522efe..c2280e0 100644 --- a/hmp.c +++ b/hmp.c @@ -2564,3 +2564,12 @@ void hmp_hotpluggable_cpus(Monitor *mon, const QDict *qdict) qapi_free_HotpluggableCPUList(saved); } + +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 05daf7c..799fd37 100644 --- a/hmp.h +++ b/hmp.h @@ -137,5 +137,6 @@ 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_dump(Monitor *mon, const QDict *qdict); void hmp_hotpluggable_cpus(Monitor *mon, const QDict *qdict); +void hmp_info_vm_generation_id(Monitor *mon, const QDict *qdict); #endif diff --git a/qapi-schema.json b/qapi-schema.json index ddc8783..0eb3964 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -6021,3 +6021,23 @@ # ## { 'command': 'query-hotpluggable-cpus', 'returns': ['HotpluggableCPU'] } + +## +# @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/stubs/Makefile.objs b/stubs/Makefile.objs index 2b5bb74..988d5d7 100644 --- a/stubs/Makefile.objs +++ b/stubs/Makefile.objs @@ -50,3 +50,4 @@ stub-obj-y += smbios_type_38.o stub-obj-y += ipmi.o stub-obj-y += pc_madt_cpu_entry.o stub-obj-y += migration-colo.o +stub-obj-y += vmgenid.o diff --git a/stubs/vmgenid.c b/stubs/vmgenid.c new file mode 100644 index 0000000..8c448ac --- /dev/null +++ b/stubs/vmgenid.c @@ -0,0 +1,8 @@ +#include "qemu/osdep.h" +#include "qmp-commands.h" + +GuidInfo *qmp_query_vm_generation_id(Error **errp) +{ + error_setg(errp, "this command is not currently supported"); + return NULL; +}