From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35906) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UlEOb-0007qV-ND for qemu-devel@nongnu.org; Sat, 08 Jun 2013 04:21:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UlEOZ-00043k-AI for qemu-devel@nongnu.org; Sat, 08 Jun 2013 04:21:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47719) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UlEOZ-00043f-2P for qemu-devel@nongnu.org; Sat, 08 Jun 2013 04:21:07 -0400 Date: Sat, 8 Jun 2013 16:21:01 +0800 From: Fam Zheng Message-ID: <20130608082101.GD9648@localhost.nay.redhat.com> References: <1370674687-13849-1-git-send-email-xiawenc@linux.vnet.ibm.com> <1370674687-13849-11-git-send-email-xiawenc@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1370674687-13849-11-git-send-email-xiawenc@linux.vnet.ibm.com> Subject: Re: [Qemu-devel] [PATCH 10/11] hmp: add interface hmp_snapshot_internal_blkdev List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Wenchao Xia Cc: kwolf@redhat.com, phrdina@redhat.com, armbru@redhat.com, qemu-devel@nongnu.org, lcapitulino@redhat.com, stefanha@redhat.com, pbonzini@redhat.com, dietmar@proxmox.com On Sat, 06/08 14:58, Wenchao Xia wrote: > Signed-off-by: Wenchao Xia > --- > hmp-commands.hx | 24 ++++++++++++++++++++++-- > hmp.c | 10 ++++++++++ > hmp.h | 1 + > 3 files changed, 33 insertions(+), 2 deletions(-) > > diff --git a/hmp-commands.hx b/hmp-commands.hx > index 396691a..65fb94d 100644 > --- a/hmp-commands.hx > +++ b/hmp-commands.hx > @@ -1025,8 +1025,7 @@ ETEXI > "of device. If a new image file is specified, the\n\t\t\t" > "new image file will become the new root image.\n\t\t\t" > "If format is specified, the snapshot file will\n\t\t\t" > - "be created in that format. Otherwise the\n\t\t\t" > - "snapshot will be internal! (currently unsupported).\n\t\t\t" > + "be created in that format.\n\t\t\t" > "The default format is qcow2. The -n flag requests QEMU\n\t\t\t" > "to reuse the image found in new-image-file, instead of\n\t\t\t" > "recreating it from scratch.", > @@ -1040,6 +1039,27 @@ Snapshot device, using snapshot file as target if provided > ETEXI > > { > + .name = "snapshot_internal_blkdev", Hmm, Just a boring naming question: snapshot_blkdev reads like a verb-object phrase "snapshot the block device", but snapshot_internal_blkdev is becoming awkward: "snapshot a internal block device"? > + .args_type = "device:B,name:s?", > + .params = "device [name]", > + .help = "take an internal snapshot of device.\n\t\t\t" > + "Name is the snapshot's name, if not specified\n\t\t\t" > + "qemu will generate one according to time.\n\t\t\t" > + "If any internal snapshot matching name already\n\t\t\t" > + "exist, or the name is an numeric string,\n\t\t\t" > + "the operation will fail.\n\t\t\t" > + "The format of the image used by device must\n\t\t\t" > + "support it, such as qcow2.\n\t\t\t", > + .mhandler.cmd = hmp_snapshot_internal_blkdev, > + }, > + > +STEXI > +@item snapshot_internal_blkdev > +@findex snapshot_internal_blkdev > +Take an internal snapshot on device if it support > +ETEXI > + > + { > .name = "drive_mirror", > .args_type = "reuse:-n,full:-f,device:B,target:s,format:s?", > .params = "[-n] [-f] device target [format]", > diff --git a/hmp.c b/hmp.c > index 494a9aa..810e4c5 100644 > --- a/hmp.c > +++ b/hmp.c > @@ -912,6 +912,16 @@ void hmp_snapshot_blkdev(Monitor *mon, const QDict *qdict) > hmp_handle_error(mon, &errp); > } > > +void hmp_snapshot_internal_blkdev(Monitor *mon, const QDict *qdict) > +{ > + const char *device = qdict_get_str(qdict, "device"); > + const char *name = qdict_get_try_str(qdict, "name"); > + Error *errp = NULL; > + > + qmp_blockdev_snapshot_internal_sync(device, !!name, name, &errp); > + hmp_handle_error(mon, &errp); > +} > + > void hmp_migrate_cancel(Monitor *mon, const QDict *qdict) > { > qmp_migrate_cancel(NULL); > diff --git a/hmp.h b/hmp.h > index 56d2e92..e7593e9 100644 > --- a/hmp.h > +++ b/hmp.h > @@ -54,6 +54,7 @@ void hmp_block_passwd(Monitor *mon, const QDict *qdict); > void hmp_balloon(Monitor *mon, const QDict *qdict); > void hmp_block_resize(Monitor *mon, const QDict *qdict); > void hmp_snapshot_blkdev(Monitor *mon, const QDict *qdict); > +void hmp_snapshot_internal_blkdev(Monitor *mon, const QDict *qdict); > void hmp_drive_mirror(Monitor *mon, const QDict *qdict); > void hmp_migrate_cancel(Monitor *mon, const QDict *qdict); > void hmp_migrate_set_downtime(Monitor *mon, const QDict *qdict); > -- > 1.7.1 > > > -- Fam