From patchwork Sat Jun 8 06:58:04 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wayne Xia X-Patchwork-Id: 249926 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 F28F92C0077 for ; Sat, 8 Jun 2013 17:03:42 +1000 (EST) Received: from localhost ([::1]:49014 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UlDBd-0007Va-2z for incoming@patchwork.ozlabs.org; Sat, 08 Jun 2013 03:03:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53632) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UlD9c-0004Ns-EM for qemu-devel@nongnu.org; Sat, 08 Jun 2013 03:01:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UlD9a-0000cO-LP for qemu-devel@nongnu.org; Sat, 08 Jun 2013 03:01:36 -0400 Received: from e23smtp06.au.ibm.com ([202.81.31.148]:43981) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UlD9a-0000bw-0p for qemu-devel@nongnu.org; Sat, 08 Jun 2013 03:01:34 -0400 Received: from /spool/local by e23smtp06.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Sat, 8 Jun 2013 16:54:40 +1000 Received: from d23dlp02.au.ibm.com (202.81.31.213) by e23smtp06.au.ibm.com (202.81.31.212) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Sat, 8 Jun 2013 16:54:39 +1000 Received: from d23relay05.au.ibm.com (d23relay05.au.ibm.com [9.190.235.152]) by d23dlp02.au.ibm.com (Postfix) with ESMTP id 84A202BB0044 for ; Sat, 8 Jun 2013 17:01:30 +1000 (EST) Received: from d23av03.au.ibm.com (d23av03.au.ibm.com [9.190.234.97]) by d23relay05.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r586kqgF39780562 for ; Sat, 8 Jun 2013 16:46:52 +1000 Received: from d23av03.au.ibm.com (loopback [127.0.0.1]) by d23av03.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r5871S7w028413 for ; Sat, 8 Jun 2013 17:01:29 +1000 Received: from RH63Wenchao.localdomain ([9.125.31.72]) by d23av03.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r586w9J2018747; Sat, 8 Jun 2013 17:01:24 +1000 From: Wenchao Xia To: qemu-devel@nongnu.org Date: Sat, 8 Jun 2013 14:58:04 +0800 Message-Id: <1370674687-13849-9-git-send-email-xiawenc@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1370674687-13849-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1370674687-13849-1-git-send-email-xiawenc@linux.vnet.ibm.com> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13060806-7014-0000-0000-00000322FF42 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 202.81.31.148 Cc: kwolf@redhat.com, phrdina@redhat.com, Wenchao Xia , armbru@redhat.com, lcapitulino@redhat.com, stefanha@redhat.com, pbonzini@redhat.com, dietmar@proxmox.com Subject: [Qemu-devel] [PATCH 08/11] qmp: add interface blockdev-snapshot-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 This interface can generate snapshot name automatically if it is not specified, since it is a single opertion. Snapshot ID can't be specified in this interface. Signed-off-by: Wenchao Xia --- blockdev.c | 25 +++++++++++++++++++++++++ qapi-schema.json | 21 +++++++++++++++++++++ qmp-commands.hx | 31 +++++++++++++++++++++++++++++++ 3 files changed, 77 insertions(+), 0 deletions(-) diff --git a/blockdev.c b/blockdev.c index aaeb0e8..6a952cd 100644 --- a/blockdev.c +++ b/blockdev.c @@ -777,6 +777,31 @@ void qmp_blockdev_snapshot_sync(const char *device, const char *snapshot_file, &snapshot, errp); } +void qmp_blockdev_snapshot_internal_sync(const char *device, + bool has_name, const char *name, + Error **errp) +{ + qemu_timeval tv; + struct tm tm; + char name1[128]; + + BlockdevSnapshotInternal snapshot = { + .device = (char *) device, + }; + + if (has_name) { + snapshot.name = (char *) name; + } else { + qemu_gettimeofday(&tv); + localtime_r((const time_t *)&tv.tv_sec, &tm); + strftime(name1, sizeof(name1), "vm-%Y%m%d%H%M%S", &tm); + snapshot.name = name1; + } + + blockdev_do_action(TRANSACTION_ACTION_KIND_BLOCKDEV_SNAPSHOT_INTERNAL_SYNC, + &snapshot, errp); +} + /* New and old BlockDriverState structs for group snapshots */ diff --git a/qapi-schema.json b/qapi-schema.json index 9e143a8..fd2f8ce 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -1689,6 +1689,27 @@ '*mode': 'NewImageMode'} } ## +# @blockdev-snapshot-internal-sync +# +# Generates a synchronous internal snapshot of a block device, when the format +# of the image used support it. +# +# @device: the name of the device to generate the snapshot from +# +# @name: #optional the new snapshot name. If not specified, a name will be +# generated according to time by qemu +# +# Returns: nothing on success +# If @device is not a valid block device, DeviceNotFound +# If any snapshot matching @name exist, or the name is a numeric which +# may mess up with snapshot ID, generic error will be returned +# +# Since 1.6 +## +{ 'command': 'blockdev-snapshot-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 d31f518..e41e98a 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -1044,6 +1044,37 @@ Example: EQMP { + .name = "blockdev-snapshot-internal-sync", + .args_type = "device:B,name:s?", + .mhandler.cmd_new = qmp_marshal_input_blockdev_snapshot_internal_sync, + }, + +SQMP +blockdev-snapshot-internal-sync +------------------------------- + +Synchronously take an internal snapshot of a block device when the format of +image used support it. If name is not specified, it will be automatically +generated by qemu according to host time. If the name is a numeric string +which may mess up with ID, such as "19", the operation will fail. If a +snapshot with name already exist, the operation will fail. + +Arguments: + +- "device": device name to snapshot (json-string) +- "name": name of the new snapshot (json-string, optional) + +Example: + +-> { "execute": "blockdev-snapshot-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?,"