From patchwork Mon Jan 23 07:32:51 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: 9531845 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 71B1860434 for ; Mon, 23 Jan 2017 07:38:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 638BB27D76 for ; Mon, 23 Jan 2017 07:38:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5879E27EED; Mon, 23 Jan 2017 07:38:05 +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 EB0E827D76 for ; Mon, 23 Jan 2017 07:38:04 +0000 (UTC) Received: from localhost ([::1]:39550 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cVZCV-0000JW-TJ for patchwork-qemu-devel@patchwork.kernel.org; Mon, 23 Jan 2017 02:38:03 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34040) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cVZ8L-0005FW-1a for qemu-devel@nongnu.org; Mon, 23 Jan 2017 02:33:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cVZ8K-0006pB-4h for qemu-devel@nongnu.org; Mon, 23 Jan 2017 02:33:45 -0500 Received: from mail-pf0-x22e.google.com ([2607:f8b0:400e:c00::22e]:35027) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cVZ8J-0006p1-V9 for qemu-devel@nongnu.org; Mon, 23 Jan 2017 02:33:44 -0500 Received: by mail-pf0-x22e.google.com with SMTP id f144so39243830pfa.2 for ; Sun, 22 Jan 2017 23:33:43 -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=kpo6OnohT3aG9gKC51+akBCJFGlBOPNrMRLrfuhIq7A=; b=cEA0roIrPabQyiVNRrZwwNvVqTObZzRD/go8WSV5AMoSaJediLpIs6TF0kQawMWGKD 1qzGV8ZXXu+cIMRsGURyF4tX1f6ULs+/hkXa1yR0lAOugaTsDk1h6GGuNrraNdXspCh5 r11k5pnWd7OPuGPx/eTLoUprpUlp4//+30clQ= 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=kpo6OnohT3aG9gKC51+akBCJFGlBOPNrMRLrfuhIq7A=; b=HyZh+7NLHV/3u/cjpncZLMTe6fRpGPC4MGnaBkKhQezvo9xfqUG1YjwR9r2AD57IWo scQ7n4Keq4X9/IHfu+0DHWz4oP8S95tpItOY4iaqa1PAbV9+v3VNu2mD38TyBe2rEHMG OSv3AbN08zn0kaFP5Olb8cmqNr1yyIX7iwbCOgXoQvTX8w9vRH1W7RNGt/6eRhAIM+Ff ucw/eqeH/FU2Dvha8DPQLd9RPXlM4UmrC0V2am2e16F0DS3ixg/fv6dkRRaJ6zYp1p+H YL0zqOjKxSWoIlbEGxThYjq2yyNDFbcwwe2IJoXOVdJ8UBZ3Ey1vT62M7I6ipCWOAAz+ 6wmA== X-Gm-Message-State: AIkVDXKQHscL1RlJBxkUxQxFttEZ95goZ87+Abmgb/65GXAK8yabfotSU/IJ3V4A+H4lzhVN X-Received: by 10.98.215.27 with SMTP id b27mr30730251pfh.70.1485156823098; Sun, 22 Jan 2017 23:33:43 -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.41 (version=TLS1 cipher=AES128-SHA bits=128/128); Sun, 22 Jan 2017 23:33:42 -0800 (PST) From: ben@skyportsystems.com To: qemu-devel@nongnu.org Date: Sun, 22 Jan 2017 23:32:51 -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:c00::22e Subject: [Qemu-devel] [PATCH v3 5/6] qmp/hmp: add set-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 set-vm-generation-id command to set Virtual Machine Generation ID counter. QMP command example: { "execute": "set-vm-generation-id", "arguments": { "guid": "324e6eaf-d1d1-4bf6-bf41-b9bb6c91fb87" } } HMP command example: set-vm-generation-id guid=324e6eaf-d1d1-4bf6-bf41-b9bb6c91fb87 Signed-off-by: Igor Mammedov Reviewed-by: Eric Blake Signed-off-by: Ben Warren --- hmp-commands.hx | 13 +++++++++++++ hmp.c | 12 ++++++++++++ hmp.h | 1 + qapi-schema.json | 11 +++++++++++ stubs/vmgenid.c | 6 ++++++ 5 files changed, 43 insertions(+) diff --git a/hmp-commands.hx b/hmp-commands.hx index 8819281..56744aa 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1775,5 +1775,18 @@ ETEXI }, STEXI +@item set-vm-generation-id @var{uuid} +Set Virtual Machine Generation ID counter to @var{guid} +ETEXI + + { + .name = "set-vm-generation-id", + .args_type = "guid:s", + .params = "guid", + .help = "Set Virtual Machine Generation ID counter", + .cmd = hmp_set_vm_generation_id, + }, + +STEXI @end table ETEXI diff --git a/hmp.c b/hmp.c index c2280e0..3a4db8b 100644 --- a/hmp.c +++ b/hmp.c @@ -2573,3 +2573,15 @@ void hmp_info_vm_generation_id(Monitor *mon, const QDict *qdict) } qapi_free_GuidInfo(info); } + +void hmp_set_vm_generation_id(Monitor *mon, const QDict *qdict) +{ + Error *errp = NULL; + const char *guid = qdict_get_str(qdict, "guid"); + + qmp_set_vm_generation_id(guid, &errp); + if (errp) { + hmp_handle_error(mon, &errp); + return; + } +} diff --git a/hmp.h b/hmp.h index 799fd37..e0ac1e8 100644 --- a/hmp.h +++ b/hmp.h @@ -138,5 +138,6 @@ 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); +void hmp_set_vm_generation_id(Monitor *mon, const QDict *qdict); #endif diff --git a/qapi-schema.json b/qapi-schema.json index 0eb3964..eddb5a9 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -6041,3 +6041,14 @@ # Since 2.9 ## { 'command': 'query-vm-generation-id', 'returns': 'GuidInfo' } + +## +# @set-vm-generation-id: +# +# Set Virtual Machine Generation ID +# +# @guid: new GUID to set as Virtual Machine Generation ID +# +# Since 2.9 +## +{ 'command': 'set-vm-generation-id', 'data': {'guid': 'str'} } diff --git a/stubs/vmgenid.c b/stubs/vmgenid.c index 8c448ac..d25d41b 100644 --- a/stubs/vmgenid.c +++ b/stubs/vmgenid.c @@ -6,3 +6,9 @@ GuidInfo *qmp_query_vm_generation_id(Error **errp) error_setg(errp, "this command is not currently supported"); return NULL; } + +void qmp_set_vm_generation_id(const char *guid, Error **errp) +{ + error_setg(errp, "this command is not currently supported"); + return; +}