From patchwork Fri Jan 8 14:10:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Denis V. Lunev" X-Patchwork-Id: 564821 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 7BF01140273 for ; Sat, 9 Jan 2016 01:11:03 +1100 (AEDT) Received: from localhost ([::1]:36233 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aHXkr-0003xq-Bz for incoming@patchwork.ozlabs.org; Fri, 08 Jan 2016 09:11:01 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51276) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aHXkI-0002w8-RV for qemu-devel@nongnu.org; Fri, 08 Jan 2016 09:10:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aHXkH-0007Ku-HG for qemu-devel@nongnu.org; Fri, 08 Jan 2016 09:10:26 -0500 Received: from mailhub.sw.ru ([195.214.232.25]:22856 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aHXkH-0007Ka-35 for qemu-devel@nongnu.org; Fri, 08 Jan 2016 09:10:25 -0500 Received: from hades.sw.ru ([10.30.8.132]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id u0739Zgw026825; Thu, 7 Jan 2016 06:09:41 +0300 (MSK) From: "Denis V. Lunev" To: Date: Fri, 8 Jan 2016 17:10:14 +0300 Message-Id: <1452262216-4545-4-git-send-email-den@openvz.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1452262216-4545-1-git-send-email-den@openvz.org> References: <1452262216-4545-1-git-send-email-den@openvz.org> X-detected-operating-system: by eggs.gnu.org: OpenBSD 3.x X-Received-From: 195.214.232.25 Cc: Juan Quintela , qemu-devel@nongnu.org, Markus Armbruster , Amit Shah , "Denis V. Lunev" Subject: [Qemu-devel] [PATCH 3/5] qmp: create qmp_delvm command 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The patch also moves hmp_delvm implementation into hmp.c. This function is just a simple wrapper now and does not have knowledge about migration internals. Signed-off-by: Denis V. Lunev CC: Juan Quintela CC: Amit Shah CC: Markus Armbruster CC: Eric Blake --- hmp.c | 11 +++++++++++ migration/savevm.c | 16 +++++++--------- qapi-schema.json | 13 +++++++++++++ qmp-commands.hx | 23 +++++++++++++++++++++++ 4 files changed, 54 insertions(+), 9 deletions(-) diff --git a/hmp.c b/hmp.c index 8d6eda6..f65bbe7 100644 --- a/hmp.c +++ b/hmp.c @@ -2411,3 +2411,14 @@ void hmp_savevm(Monitor *mon, const QDict *qdict) error_report_err(local_err); } } + +void hmp_delvm(Monitor *mon, const QDict *qdict) +{ + Error *local_err = NULL; + + qmp_delvm(qdict_get_str(qdict, "name"), &local_err); + + if (local_err != NULL) { + error_report_err(local_err); + } +} diff --git a/migration/savevm.c b/migration/savevm.c index 0dbb15f..1262b57 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -2092,17 +2092,15 @@ int load_vmstate(const char *name) return 0; } -void hmp_delvm(Monitor *mon, const QDict *qdict) +void qmp_delvm(const char *name, Error **errp) { BlockDriverState *bs; - Error *err; - const char *name = qdict_get_str(qdict, "name"); - - if (bdrv_all_delete_snapshot(name, &bs, &err) < 0) { - monitor_printf(mon, - "Error while deleting snapshot on device '%s': %s\n", - bdrv_get_device_name(bs), error_get_pretty(err)); - error_free(err); + Error *local_err = NULL; + + if (bdrv_all_delete_snapshot(name, &bs, &local_err) < 0) { + error_setg(errp, "Error while deleting snapshot on device '%s': %s", + bdrv_get_device_name(bs), error_get_pretty(local_err)); + error_free(local_err); } } diff --git a/qapi-schema.json b/qapi-schema.json index 09d1a1a..94a2764 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -4067,3 +4067,16 @@ # Since 2.6 ## { 'command': 'savevm', 'data': {'name': 'str'} } + +## +# @delvm +# +# Delete a VM snapshot +# +# @name: identifier of a snapshot to be deleted +# +# Returns: Nothing on success +# +# Since 2.6 +## +{ 'command': 'delvm', 'data': {'name': 'str'} } diff --git a/qmp-commands.hx b/qmp-commands.hx index b7851e1..5e6f573 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -4820,3 +4820,26 @@ EQMP .args_type = "name:s", .mhandler.cmd_new = qmp_marshal_savevm, }, + +SQMP +delvm +----- + +Delete a VM snapshot + +Arguments: + +- "name": snapshot name + +Example: + +-> { "execute": "delvm", "arguments": { "name": "snapshot1" } } +<- { "return": {} } + +EQMP + + { + .name = "delvm", + .args_type = "name:s", + .mhandler.cmd_new = qmp_marshal_delvm, + },