From patchwork Mon Jan 16 19:20:56 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: 9519363 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 745FB600C5 for ; Mon, 16 Jan 2017 19:33:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6503B20572 for ; Mon, 16 Jan 2017 19:33:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 59A3B26E78; Mon, 16 Jan 2017 19:33:25 +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 D4BC420572 for ; Mon, 16 Jan 2017 19:33:24 +0000 (UTC) Received: from localhost ([::1]:59112 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cTD1v-0003sj-VO for patchwork-qemu-devel@patchwork.kernel.org; Mon, 16 Jan 2017 14:33:24 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56898) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cTCq5-0002UI-Le for qemu-devel@nongnu.org; Mon, 16 Jan 2017 14:21:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cTCq4-0007I4-J4 for qemu-devel@nongnu.org; Mon, 16 Jan 2017 14:21:09 -0500 Received: from mail-pg0-x22c.google.com ([2607:f8b0:400e:c05::22c]:34073) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cTCq4-0007Hn-DB for qemu-devel@nongnu.org; Mon, 16 Jan 2017 14:21:08 -0500 Received: by mail-pg0-x22c.google.com with SMTP id 14so17666902pgg.1 for ; Mon, 16 Jan 2017 11:21:08 -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=t1QiUmSnVvoHiJwKRiKphTo0Y5MU0mkcWrr/0ZsHUhQ=; b=YKgWJt+vIBEJpKTXBd1camuI/gzvAqp6yAyB/SdKiT8JVZoqPBdkTgUEDygdKKRypJ gNakjK7gfcA8VWA0vy9eg7x/R/fPA8NOua5iQ6M3y2+xfVmpI6vahnb47vEebwl6KY6B uhCKEOpvGHrvoPXJJysQ/k8wImO+IQCoVr7mA= 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=t1QiUmSnVvoHiJwKRiKphTo0Y5MU0mkcWrr/0ZsHUhQ=; b=HbPbpaqgFPA0T/Bk0Q0Eyw2Ayx6rwgZrXgEW5rmoKlkfopKgsBBWMIeSH9yvjaqifl sYsErU0izvu/LX0wbERccS9CaEiXEvSOrqUGAJ6/c/CM7Wlbr7LuImh80qBWCKd5d3x1 ICxjjZfIsXmCVP+DboAgu9zUkr8VnRyDr8kaypc8RQCrdhhX/Roz5ylo/bEfa5b87TCL x5jLWPmMTx9FuEi+Tsl6NG5zkDyDALG6WubdCWEGAm2ONl2d5SuQEUNEcpdAAQv7MHeF J0ls3TRFs4nOctm97vPH6ciGiOWonD2lDuizsbwXd8LANWK+lFtPuEr3KmEAFxHrWcP8 enMQ== X-Gm-Message-State: AIkVDXKPTaINFMqAGmUi9Qr0Ar7FMAUadgeYnWSCA/Nf0CS4zeahJRgt4KXl79UM/xSjua2n X-Received: by 10.84.149.139 with SMTP id m11mr52778898pla.38.1484594467532; Mon, 16 Jan 2017 11:21:07 -0800 (PST) Received: from Arrow.corp.skyportsystems.com (67-207-112-138.static.wiline.com. [67.207.112.138]) by smtp.gmail.com with ESMTPSA id w76sm43886299pfd.74.2017.01.16.11.21.06 (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 16 Jan 2017 11:21:07 -0800 (PST) From: ben@skyportsystems.com To: qemu-devel@nongnu.org Date: Mon, 16 Jan 2017 11:20:56 -0800 Message-Id: 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:c05::22c Subject: [Qemu-devel] [PATCH v2 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 b869617..9ec27ae 100644 --- a/hmp.c +++ b/hmp.c @@ -2570,3 +2570,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 a0d3b5d..2348391 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -4776,3 +4776,23 @@ # Since: 2.7 ## { '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; +}