From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from [140.186.70.92] (port=39373 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1PSucT-0007Mi-Bz
	for qemu-devel@nongnu.org; Wed, 15 Dec 2010 11:54:26 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <kwolf@redhat.com>) id 1PSucR-0007q4-LD
	for qemu-devel@nongnu.org; Wed, 15 Dec 2010 11:54:25 -0500
Received: from mx1.redhat.com ([209.132.183.28]:58714)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <kwolf@redhat.com>) id 1PSucR-0007pu-Cz
	for qemu-devel@nongnu.org; Wed, 15 Dec 2010 11:54:23 -0500
Message-ID: <4D08F305.1040503@redhat.com>
Date: Wed, 15 Dec 2010 17:55:33 +0100
From: Kevin Wolf <kwolf@redhat.com>
MIME-Version: 1.0
References: <1292225579-27320-1-git-send-email-Jes.Sorensen@redhat.com>
	<1292225579-27320-3-git-send-email-Jes.Sorensen@redhat.com>
In-Reply-To: <1292225579-27320-3-git-send-email-Jes.Sorensen@redhat.com>
Content-Type: text/plain; charset=ISO-8859-15
Content-Transfer-Encoding: 7bit
Subject: [Qemu-devel] Re: [PATCH 2/3] Introduce do_snapshot_blkdev() and
 monitor command to handle it.
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Jes.Sorensen@redhat.com
Cc: qemu-devel@nongnu.org, armbru@redhat.com, stefanha@linux.vnet.ibm.com

Am 13.12.2010 08:32, schrieb Jes.Sorensen@redhat.com:
> From: Jes Sorensen <Jes.Sorensen@redhat.com>
> 
> The monitor command is:
> snapshot_blkdev <device> [snapshot-file] [format]
> 
> Default format is qcow2. For now snapshots without a snapshot-file, eg
> internal snapshots, are not supported.
> 
> Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
> ---
>  blockdev.c      |   61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
>  blockdev.h      |    1 +
>  hmp-commands.hx |   19 +++++++++++++++++
>  3 files changed, 81 insertions(+), 0 deletions(-)
> 
> diff --git a/blockdev.c b/blockdev.c
> index f6ac439..1ea24d7 100644
> --- a/blockdev.c
> +++ b/blockdev.c
> @@ -514,6 +514,67 @@ void do_commit(Monitor *mon, const QDict *qdict)
>      }
>  }
>  
> +int do_snapshot_blkdev(Monitor *mon, const QDict *qdict, QObject **ret_data)
> +{
> +    const char *device = qdict_get_str(qdict, "device");
> +    const char *filename = qdict_get_try_str(qdict, "snapshot_file");
> +    const char *format = qdict_get_try_str(qdict, "format");
> +    const char format_qcow2[] = "qcow2";
> +    BlockDriverState *bs;
> +    BlockDriver *drv, *proto_drv;
> +    int ret = 0;
> +    int flags;
> +
> +    bs = bdrv_find(device);
> +    if (!bs) {
> +        qerror_report(QERR_DEVICE_NOT_FOUND, device);
> +        ret = -1;
> +        goto out;
> +    }
> +
> +    if (!format) {
> +        format = format_qcow2;
> +    }
> +
> +    drv = bdrv_find_format(format);
> +    if (!drv) {
> +        qerror_report(QERR_INVALID_BLOCK_FORMAT, format);
> +        ret = -1;
> +        goto out;
> +    }
> +
> +    proto_drv = bdrv_find_protocol(filename);
> +    if (!proto_drv) {
> +        qerror_report(QERR_INVALID_BLOCK_FORMAT, format);
> +        ret = -1;
> +        goto out;
> +    }
> +
> +    ret = bdrv_img_create(filename, format, bs->filename,
> +                          bs->drv->format_name, NULL, -1, bs->open_flags);
> +    if (ret) {
> +        goto out;
> +    }
> +
> +    qemu_aio_flush();
> +    bdrv_flush(bs);
> +
> +    flags = bs->open_flags;
> +    bdrv_close(bs);
> +    ret = bdrv_open(bs, filename, flags, drv);
> +    /*
> +     * If reopening the image file we just created fails, we really
> +     * are in trouble :(
> +     */
> +    assert(ret == 0);
> +out:
> +    if (ret) {
> +        ret = 1;

I seem to remember that errors are always -1 for monitor commands.

Kevin