From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56314) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zv5pj-0003Zt-1a for qemu-devel@nongnu.org; Sat, 07 Nov 2015 10:55:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zv5pi-0005dd-67 for qemu-devel@nongnu.org; Sat, 07 Nov 2015 10:55:14 -0500 Received: from mailhub.sw.ru ([195.214.232.25]:12004 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zv5ph-0005dU-R4 for qemu-devel@nongnu.org; Sat, 07 Nov 2015 10:55:14 -0500 From: "Denis V. Lunev" Date: Sat, 7 Nov 2015 18:54:57 +0300 Message-Id: <1446911700-16803-8-git-send-email-den@openvz.org> In-Reply-To: <1446911700-16803-1-git-send-email-den@openvz.org> References: <1446911700-16803-1-git-send-email-den@openvz.org> Subject: [Qemu-devel] [PATCH 07/10] snapshot: create bdrv_all_create_snapshot helper List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , "Denis V. Lunev" , qemu-devel@nongnu.org, Stefan Hajnoczi , Juan Quintela to create snapshot for all loaded block drivers. The patch also ensures proper locking. Signed-off-by: Denis V. Lunev CC: Juan Quintela CC: Stefan Hajnoczi CC: Kevin Wolf --- block/snapshot.c | 22 ++++++++++++++++++++++ include/block/snapshot.h | 1 + migration/savevm.c | 20 +++++--------------- 3 files changed, 28 insertions(+), 15 deletions(-) diff --git a/block/snapshot.c b/block/snapshot.c index a7f1f8d..4daf9d4 100644 --- a/block/snapshot.c +++ b/block/snapshot.c @@ -443,3 +443,25 @@ int bdrv_all_find_snapshot(const char *name, BlockDriverState **first_bad_bs) *first_bad_bs = bs; return err; } + +int bdrv_all_create_snapshot(QEMUSnapshotInfo *sn, BlockDriverState **bad) +{ + int err = 0; + BlockDriverState *bs = NULL; + + while (err == 0 && (bs = bdrv_next(bs))) { + AioContext *ctx = bdrv_get_aio_context(bs); + + aio_context_acquire(ctx); + if (bdrv_can_snapshot(bs)) { + err = bdrv_snapshot_create(bs, sn); + /* Tricky part here. First image contains VM state. The behavior + * is matched one in bdrv_all_find_vmstate_bs */ + sn->vm_state_size = 0; + } + aio_context_release(ctx); + } + + *bad = bs; + return err; +} diff --git a/include/block/snapshot.h b/include/block/snapshot.h index 10ee582..df443b2 100644 --- a/include/block/snapshot.h +++ b/include/block/snapshot.h @@ -86,5 +86,6 @@ int bdrv_all_delete_snapshot(const char *name, BlockDriverState **first_bsd_bs, Error **err); int bdrv_all_goto_snapshot(const char *name, BlockDriverState **first_bsd_bs); int bdrv_all_find_snapshot(const char *name, BlockDriverState **first_bad_bs); +int bdrv_all_create_snapshot(QEMUSnapshotInfo *sn, BlockDriverState **bad); #endif diff --git a/migration/savevm.c b/migration/savevm.c index 0c2890d..f72349d 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -1255,7 +1255,6 @@ void hmp_savevm(Monitor *mon, const QDict *qdict) int ret; QEMUFile *f; int saved_vm_running; - uint64_t vm_state_size; qemu_timeval tv; struct tm tm; const char *name = qdict_get_try_str(qdict, "name"); @@ -1320,7 +1319,7 @@ void hmp_savevm(Monitor *mon, const QDict *qdict) goto the_end; } ret = qemu_savevm_state(f, &local_err); - vm_state_size = qemu_ftell(f); + sn->vm_state_size = qemu_ftell(f); qemu_fclose(f); if (ret < 0) { monitor_printf(mon, "%s\n", error_get_pretty(local_err)); @@ -1328,19 +1327,10 @@ void hmp_savevm(Monitor *mon, const QDict *qdict) goto the_end; } - /* create the snapshots */ - - bs1 = NULL; - while ((bs1 = bdrv_next(bs1))) { - if (bdrv_can_snapshot(bs1)) { - /* Write VM state size only to the image that contains the state */ - sn->vm_state_size = (bs == bs1 ? vm_state_size : 0); - ret = bdrv_snapshot_create(bs1, sn); - if (ret < 0) { - monitor_printf(mon, "Error while creating snapshot on '%s'\n", - bdrv_get_device_name(bs1)); - } - } + ret = bdrv_all_create_snapshot(sn, &bs); + if (ret < 0) { + monitor_printf(mon, "Error while creating snapshot on '%s'\n", + bdrv_get_device_name(bs)); } the_end: -- 2.5.0