From patchwork Fri Jun 14 11:39:56 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wayne Xia X-Patchwork-Id: 251414 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)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 2EB002C0084 for ; Fri, 14 Jun 2013 22:04:52 +1000 (EST) Received: from localhost ([::1]:34958 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UnSkK-0004OB-9Y for incoming@patchwork.ozlabs.org; Fri, 14 Jun 2013 08:04:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42321) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UnSQE-0001j1-1Z for qemu-devel@nongnu.org; Fri, 14 Jun 2013 07:44:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UnSQC-0006ms-O4 for qemu-devel@nongnu.org; Fri, 14 Jun 2013 07:44:02 -0400 Received: from e23smtp05.au.ibm.com ([202.81.31.147]:59522) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UnSQ3-0006iL-SO for qemu-devel@nongnu.org; Fri, 14 Jun 2013 07:44:00 -0400 Received: from /spool/local by e23smtp05.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 14 Jun 2013 21:37:38 +1000 Received: from d23dlp01.au.ibm.com (202.81.31.203) by e23smtp05.au.ibm.com (202.81.31.211) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 14 Jun 2013 21:37:23 +1000 Received: from d23relay04.au.ibm.com (d23relay04.au.ibm.com [9.190.234.120]) by d23dlp01.au.ibm.com (Postfix) with ESMTP id 1097D2CE8078 for ; Fri, 14 Jun 2013 21:42:05 +1000 (EST) Received: from d23av04.au.ibm.com (d23av04.au.ibm.com [9.190.235.139]) by d23relay04.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r5EBRT9c065970 for ; Fri, 14 Jun 2013 21:27:29 +1000 Received: from d23av04.au.ibm.com (loopback [127.0.0.1]) by d23av04.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r5EBg4vp026652 for ; Fri, 14 Jun 2013 21:42:04 +1000 Received: from RH63Wenchao (wenchaox.cn.ibm.com [9.115.122.53]) by d23av04.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r5EBe6Xk024253; Fri, 14 Jun 2013 21:42:02 +1000 From: Wenchao Xia To: qemu-devel@nongnu.org Date: Fri, 14 Jun 2013 19:39:56 +0800 Message-Id: <1371209999-15579-10-git-send-email-xiawenc@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1371209999-15579-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1371209999-15579-1-git-send-email-xiawenc@linux.vnet.ibm.com> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13061411-1396-0000-0000-0000031F0FF1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 202.81.31.147 Cc: kwolf@redhat.com, phrdina@redhat.com, famz@redhat.com, Wenchao Xia , armbru@redhat.com, lcapitulino@redhat.com, stefanha@redhat.com, pbonzini@redhat.com, dietmar@proxmox.com Subject: [Qemu-devel] [PATCH V2 09/12] qmp: add interface blockdev-snapshot-delete-internal-sync 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 Snapshot ID can't be specified in this interface. Signed-off-by: Wenchao Xia --- blockdev.c | 12 ++++++++++++ qapi-schema.json | 19 +++++++++++++++++++ qmp-commands.hx | 30 ++++++++++++++++++++++++++++++ 3 files changed, 61 insertions(+), 0 deletions(-) diff --git a/blockdev.c b/blockdev.c index 6a952cd..0277482 100644 --- a/blockdev.c +++ b/blockdev.c @@ -802,6 +802,18 @@ void qmp_blockdev_snapshot_internal_sync(const char *device, &snapshot, errp); } +void qmp_blockdev_snapshot_delete_internal_sync(const char *device, + const char *name, + Error **errp) +{ + BlockDriverState *bs = bdrv_find(device); + if (!bs) { + error_set(errp, QERR_DEVICE_NOT_FOUND, device); + return; + }; + + bdrv_snapshot_delete(bs, NULL, name, errp); +} /* New and old BlockDriverState structs for group snapshots */ diff --git a/qapi-schema.json b/qapi-schema.json index 749a349..b5e4f87 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -1712,6 +1712,25 @@ 'data': { 'device': 'str', '*name': 'str'} } ## +# @blockdev-snapshot-delete-internal-sync +# +# Synchronously delete an internal snapshot of a block device, when the format +# of the image used support it. +# +# @device: the name of the device to delete the snapshot from +# +# @name: the snapshot's name to be deleted +# +# Returns: nothing on success +# If @device is not a valid block device, DeviceNotFound +# If snapshot not found, generic error will be returned +# +# Since 1.6 +## +{ 'command': 'blockdev-snapshot-delete-internal-sync', + 'data': { 'device': 'str', 'name': 'str'} } + +## # @human-monitor-command: # # Execute a command on the human monitor and return the output. diff --git a/qmp-commands.hx b/qmp-commands.hx index 3d5f996..904950f 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -1075,6 +1075,36 @@ Example: EQMP { + .name = "blockdev-snapshot-delete-internal-sync", + .args_type = "device:B,name:s", + .mhandler.cmd_new = + qmp_marshal_input_blockdev_snapshot_delete_internal_sync, + }, + +SQMP +blockdev-snapshot-delete-internal-sync +-------------------------------------- + +Synchronously delete an internal snapshot of a block device when the format of +image used support it. If the snapshot matching name is not found, operation +will fail. + +Arguments: + +- "device": device name (json-string) +- "name": name of the snapshot (json-string) + +Example: + +-> { "execute": "blockdev-snapshot-delete-internal-sync", + "arguments": { "device": "ide-hd0", + "name": "snapshot0" } + } +<- { "return": {} } + +EQMP + + { .name = "drive-mirror", .args_type = "sync:s,device:B,target:s,speed:i?,mode:s?,format:s?," "on-source-error:s?,on-target-error:s?,"