From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54574) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZuGYE-0003nm-PB for qemu-devel@nongnu.org; Thu, 05 Nov 2015 04:09:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZuGY9-00074q-Mq for qemu-devel@nongnu.org; Thu, 05 Nov 2015 04:09:46 -0500 Received: from e06smtp05.uk.ibm.com ([195.75.94.101]:37787) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZuGY9-00074m-DR for qemu-devel@nongnu.org; Thu, 05 Nov 2015 04:09:41 -0500 Received: from localhost by e06smtp05.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 5 Nov 2015 09:09:39 -0000 Received: from b06cxnps4074.portsmouth.uk.ibm.com (d06relay11.portsmouth.uk.ibm.com [9.149.109.196]) by d06dlp03.portsmouth.uk.ibm.com (Postfix) with ESMTP id 5E0E41B0804B for ; Thu, 5 Nov 2015 09:09:51 +0000 (GMT) Received: from d06av07.portsmouth.uk.ibm.com (d06av07.portsmouth.uk.ibm.com [9.149.37.248]) by b06cxnps4074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id tA599a7Y8585588 for ; Thu, 5 Nov 2015 09:09:37 GMT Received: from d06av07.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av07.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id tA599a0E031364 for ; Thu, 5 Nov 2015 02:09:36 -0700 Date: Thu, 5 Nov 2015 10:09:29 +0100 From: Greg Kurz Message-ID: <20151105100929.32290017@bahia.local> In-Reply-To: <1446657582-21619-5-git-send-email-den@openvz.org> References: <1446657582-21619-1-git-send-email-den@openvz.org> <1446657582-21619-5-git-send-email-den@openvz.org> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 04/11] snapshot: create bdrv_all_goto_snapshot helper List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Denis V. Lunev" Cc: Kevin Wolf , qemu-devel@nongnu.org, Stefan Hajnoczi , Juan Quintela On Wed, 4 Nov 2015 20:19:35 +0300 "Denis V. Lunev" wrote: > to switch to snapshot on 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 > --- Reviewed-by: Greg Kurz > block/snapshot.c | 20 ++++++++++++++++++++ > include/block/snapshot.h | 1 + > migration/savevm.c | 15 +++++---------- > 3 files changed, 26 insertions(+), 10 deletions(-) > > diff --git a/block/snapshot.c b/block/snapshot.c > index 1b4b846..639074f 100644 > --- a/block/snapshot.c > +++ b/block/snapshot.c > @@ -406,3 +406,23 @@ int bdrv_all_delete_snapshot(const char *name, BlockDriverState **first_bad_bs, > *first_bad_bs = bs; > return ret; > } > + > + > +int bdrv_all_goto_snapshot(const char *name, BlockDriverState **first_bad_bs) > +{ > + int err = 0; Cosmetic comment again :) What about s/err/ret to be consistent with other functions in block/snapshot.c ? > + BlockDriverState *bs = NULL; > + > + while ((bs = bdrv_next(bs)) && err == 0) { > + AioContext *ctx = bdrv_get_aio_context(bs); > + > + aio_context_acquire(ctx); > + if (bdrv_can_snapshot(bs)) { > + err = bdrv_snapshot_goto(bs, name); > + } > + aio_context_release(ctx); > + } > + > + *first_bad_bs = bs; > + return err; > +} > diff --git a/include/block/snapshot.h b/include/block/snapshot.h > index 9c9750a..9c54b7c 100644 > --- a/include/block/snapshot.h > +++ b/include/block/snapshot.h > @@ -85,5 +85,6 @@ int bdrv_snapshot_load_tmp_by_id_or_name(BlockDriverState *bs, > bool bdrv_all_can_snapshot(BlockDriverState **first_bad_bs); > 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); > > #endif > diff --git a/migration/savevm.c b/migration/savevm.c > index 5a4a8c2..101dff5 100644 > --- a/migration/savevm.c > +++ b/migration/savevm.c > @@ -1425,16 +1425,11 @@ int load_vmstate(const char *name) > /* Flush all IO requests so they don't interfere with the new state. */ > bdrv_drain_all(); > > - bs = NULL; > - while ((bs = bdrv_next(bs))) { > - if (bdrv_can_snapshot(bs)) { > - ret = bdrv_snapshot_goto(bs, name); > - if (ret < 0) { > - error_report("Error %d while activating snapshot '%s' on '%s'", > - ret, name, bdrv_get_device_name(bs)); > - return ret; > - } > - } > + ret = bdrv_all_goto_snapshot(name, &bs); > + if (ret < 0) { > + error_report("Error %d while activating snapshot '%s' on '%s'", > + ret, name, bdrv_get_device_name(bs)); > + return ret; > } > > /* restore the VM state */