From patchwork Mon Jan 28 17:04:37 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Beno=C3=AEt_Canet?= X-Patchwork-Id: 216252 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 516092C0090 for ; Tue, 29 Jan 2013 04:04:39 +1100 (EST) Received: from localhost ([::1]:36589 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tzs8L-0003fM-BA for incoming@patchwork.ozlabs.org; Mon, 28 Jan 2013 12:04:37 -0500 Received: from eggs.gnu.org ([208.118.235.92]:44829) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tzs84-0003W4-4Q for qemu-devel@nongnu.org; Mon, 28 Jan 2013 12:04:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tzs7x-0007hE-8F for qemu-devel@nongnu.org; Mon, 28 Jan 2013 12:04:20 -0500 Received: from nodalink.pck.nerim.net ([62.212.105.220]:48455 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tzs7w-0007gz-RT for qemu-devel@nongnu.org; Mon, 28 Jan 2013 12:04:13 -0500 Received: by paradis.irqsave.net (Postfix, from userid 1002) id 2B2A7874325; Mon, 28 Jan 2013 18:04:12 +0100 (CET) Received: from localhost.localdomain (unknown [192.168.77.1]) by paradis.irqsave.net (Postfix) with ESMTP id CD04087431B; Mon, 28 Jan 2013 18:04:00 +0100 (CET) From: =?UTF-8?q?Beno=C3=AEt=20Canet?= To: qemu-devel@nongnu.org Date: Mon, 28 Jan 2013 18:04:37 +0100 Message-Id: <1359392680-15838-2-git-send-email-benoit@irqsave.net> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1359392680-15838-1-git-send-email-benoit@irqsave.net> References: <1359392680-15838-1-git-send-email-benoit@irqsave.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 62.212.105.220 Cc: kwolf@redhat.com, =?UTF-8?q?Beno=C3=AEt=20Canet?= , stefanha@redhat.com Subject: [Qemu-devel] [PATCH V2 1/4] block: Add option to do external snapshot image creation in the block drivers. 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 patch will allow protocols to implements snapshots as the image creation can now delegated to the block driver. Signed-off-by: Benoit Canet --- block.c | 26 ++++++++++++++++++++++++++ blockdev.c | 8 ++++---- include/block/block.h | 6 ++++++ include/block/block_int.h | 8 ++++++++ 4 files changed, 44 insertions(+), 4 deletions(-) diff --git a/block.c b/block.c index 6fa7c90..41a9ac0 100644 --- a/block.c +++ b/block.c @@ -4626,3 +4626,29 @@ out: bdrv_delete(bs); } } + +void bdrv_ext_snapshot_img_create(BlockDriverState *old_bs, + const char *filename, const char *fmt, + const char *base_filename, + const char *base_fmt, + char *options, uint64_t img_size, + int flags, Error **errp) +{ + if (!old_bs || !old_bs->file || !old_bs->file->drv) { + error_setg(errp, "Block driver not reachable."); + return; + } + + if (!old_bs->file->drv->bdrv_ext_snapshot_img_create) { + bdrv_img_create(filename, fmt, base_filename, base_fmt, options, + img_size, flags, errp); + return; + } + + old_bs->file->drv->bdrv_ext_snapshot_img_create(old_bs, + filename, fmt, + base_filename, + base_fmt, + options, img_size, + flags, errp); +} diff --git a/blockdev.c b/blockdev.c index 9126587..0ce45c5 100644 --- a/blockdev.c +++ b/blockdev.c @@ -787,10 +787,10 @@ void qmp_transaction(BlockdevActionList *dev_list, Error **errp) /* create new image w/backing file */ if (mode != NEW_IMAGE_MODE_EXISTING) { - bdrv_img_create(new_image_file, format, - states->old_bs->filename, - states->old_bs->drv->format_name, - NULL, -1, flags, &local_err); + bdrv_ext_snapshot_img_create(states->old_bs, new_image_file, format, + states->old_bs->filename, + states->old_bs->drv->format_name, + NULL, -1, flags, &local_err); if (error_is_set(&local_err)) { error_propagate(errp, local_err); goto delete_and_fail; diff --git a/include/block/block.h b/include/block/block.h index ffd1936..12470fc 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -346,6 +346,12 @@ int bdrv_load_vmstate(BlockDriverState *bs, uint8_t *buf, void bdrv_img_create(const char *filename, const char *fmt, const char *base_filename, const char *base_fmt, char *options, uint64_t img_size, int flags, Error **errp); +void bdrv_ext_snapshot_img_create(BlockDriverState *old_bs, + const char *filename, const char *fmt, + const char *base_filename, + const char *base_fmt, + char *options, uint64_t img_size, + int flags, Error **errp); void bdrv_set_buffer_alignment(BlockDriverState *bs, int align); void *qemu_blockalign(BlockDriverState *bs, size_t size); diff --git a/include/block/block_int.h b/include/block/block_int.h index f83ffb8..5bab830 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -202,6 +202,14 @@ struct BlockDriver { */ int (*bdrv_has_zero_init)(BlockDriverState *bs); + /* optional field */ + void (*bdrv_ext_snapshot_img_create)(BlockDriverState *bs, + const char *filename, const char *fmt, + const char *base_filename, + const char *base_fmt, + char *options, uint64_t img_size, + int flags, Error **errp); + QLIST_ENTRY(BlockDriver) list; };