From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41892) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UnSOj-0007Qb-Hg for qemu-devel@nongnu.org; Fri, 14 Jun 2013 07:42:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UnSOi-0006EC-49 for qemu-devel@nongnu.org; Fri, 14 Jun 2013 07:42:29 -0400 Received: from e23smtp01.au.ibm.com ([202.81.31.143]:32947) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UnSOZ-00068b-FN for qemu-devel@nongnu.org; Fri, 14 Jun 2013 07:42:28 -0400 Received: from /spool/local by e23smtp01.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 14 Jun 2013 21:33:28 +1000 Received: from d23relay03.au.ibm.com (d23relay03.au.ibm.com [9.190.235.21]) by d23dlp02.au.ibm.com (Postfix) with ESMTP id 622942BB0059 for ; Fri, 14 Jun 2013 21:42:02 +1000 (EST) Received: from d23av04.au.ibm.com (d23av04.au.ibm.com [9.190.235.139]) by d23relay03.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r5EBfrhC30539840 for ; Fri, 14 Jun 2013 21:41:53 +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 r5EBg1wm026623 for ; Fri, 14 Jun 2013 21:42:02 +1000 From: Wenchao Xia Date: Fri, 14 Jun 2013 19:39:55 +0800 Message-Id: <1371209999-15579-9-git-send-email-xiawenc@linux.vnet.ibm.com> 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> Subject: [Qemu-devel] [PATCH V2 08/12] qmp: add interface blockdev-snapshot-internal-sync List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org 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 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 | 23 +++++++++++++++++++++++ qmp-commands.hx | 31 +++++++++++++++++++++++++++++++ 3 files changed, 79 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 c53cb31..749a349 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -1689,6 +1689,29 @@ '*mode': 'NewImageMode'} } ## +# @blockdev-snapshot-internal-sync +# +# Synchronously take an internal snapshot of a block device, when the format +# of the image used supports 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 exists, or the name is a numeric +# which may mess up with snapshot ID, generic error will be returned +# If the format of the image used does not support it, +# BlockFormatFeatureNotSupported +# +# 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 db5d4e3..3d5f996 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 supports 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 exists, 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?," -- 1.7.1