From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43336) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eyKkB-0003b8-QB for qemu-devel@nongnu.org; Tue, 20 Mar 2018 13:08:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eyKk8-0003gq-Kj for qemu-devel@nongnu.org; Tue, 20 Mar 2018 13:08:15 -0400 References: <20180320170521.32152-1-vsementsov@virtuozzo.com> <20180320170521.32152-4-vsementsov@virtuozzo.com> From: Vladimir Sementsov-Ogievskiy Message-ID: <4dc03165-f337-fec4-9cb8-4e06bf82f87d@virtuozzo.com> Date: Tue, 20 Mar 2018 20:07:56 +0300 MIME-Version: 1.0 In-Reply-To: <20180320170521.32152-4-vsementsov@virtuozzo.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US Subject: Re: [Qemu-devel] [PATCH v4 2/3] qcow2: handle reopening bitmaps on bdrv_invalidate_cache DROP IT List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, qemu-block@nongnu.org Cc: mreitz@redhat.com, kwolf@redhat.com, jsnow@redhat.com, den@openvz.org Oh, sorry, just drop it. (the only difference is commit message subject) 20.03.2018 20:05, Vladimir Sementsov-Ogievskiy wrote: > On reopen with existing bitmaps, instead of loading bitmaps, lets > reopen them if needed. This also fixes bitmaps migration through > shared storage. > Consider the case. Persistent bitmaps are stored on bdrv_inactivate. > Then, on destination process_incoming_migration_bh() calls > bdrv_invalidate_cache_all() which leads to > qcow2_load_autoloading_dirty_bitmaps() which fails if bitmaps are > already loaded on destination start. > > Signed-off-by: Vladimir Sementsov-Ogievskiy > --- > block/qcow2.c | 17 ++++++++++++++++- > 1 file changed, 16 insertions(+), 1 deletion(-) > > diff --git a/block/qcow2.c b/block/qcow2.c > index 7472af6931..d2d129a2e6 100644 > --- a/block/qcow2.c > +++ b/block/qcow2.c > @@ -1480,7 +1480,22 @@ static int coroutine_fn qcow2_do_open(BlockDriverState *bs, QDict *options, > s->autoclear_features &= QCOW2_AUTOCLEAR_MASK; > } > > - if (qcow2_load_dirty_bitmaps(bs, &local_err)) { > + if (bdrv_dirty_bitmap_next(bs, NULL)) { > + /* It's some kind of reopen with already existing dirty bitmaps. There > + * are no known cases where we need loading bitmaps in such situation, > + * so it's safer don't load them. > + * > + * Moreover, if we have some readonly bitmaps and we are reopening for > + * rw we should reopen bitmaps correspondingly. > + */ > + if (bdrv_has_readonly_bitmaps(bs) && > + !bdrv_is_read_only(bs) && !(bdrv_get_flags(bs) & BDRV_O_INACTIVE)) > + { > + bool header_updated = false; > + qcow2_reopen_bitmaps_rw_hint(bs, &header_updated, &local_err); > + update_header = update_header && !header_updated; > + } > + } else if (qcow2_load_dirty_bitmaps(bs, &local_err)) { > update_header = false; > } > if (local_err != NULL) { -- Best regards, Vladimir