qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: John Snow <jsnow@redhat.com>
To: qemu-devel@nongnu.org, qemu-block@nongnu.org
Cc: eblake@redhat.com, Max Reitz <mreitz@redhat.com>,
	Fam Zheng <fam@euphon.net>,
	vsementsov@virtuozzo.com, John Snow <jsnow@redhat.com>,
	Kevin Wolf <kwolf@redhat.com>,
	Markus Armbruster <armbru@redhat.com>
Subject: [Qemu-devel] [PATCH v6 02/11] block/dirty-bitmap: remove assertion from restore
Date: Fri, 21 Dec 2018 04:35:20 -0500	[thread overview]
Message-ID: <20181221093529.23855-3-jsnow@redhat.com> (raw)
In-Reply-To: <20181221093529.23855-1-jsnow@redhat.com>

When making a backup of a dirty bitmap (for transactions), we want to
restore that backup whether or not the bitmap is enabled.

It is perfectly valid to write into bitmaps that are disabled. It is
only illegitimate for the guest to have done so.

Remove this assertion.

Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Signed-off-by: John Snow <jsnow@redhat.com>
---
 block/dirty-bitmap.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/block/dirty-bitmap.c b/block/dirty-bitmap.c
index 89fd1d7f8b..6b688394e4 100644
--- a/block/dirty-bitmap.c
+++ b/block/dirty-bitmap.c
@@ -625,7 +625,6 @@ void bdrv_clear_dirty_bitmap(BdrvDirtyBitmap *bitmap, HBitmap **out)
 void bdrv_restore_dirty_bitmap(BdrvDirtyBitmap *bitmap, HBitmap *backup)
 {
     HBitmap *tmp = bitmap->bitmap;
-    assert(bdrv_dirty_bitmap_enabled(bitmap));
     assert(!bdrv_dirty_bitmap_readonly(bitmap));
     bitmap->bitmap = backup;
     hbitmap_free(tmp);
-- 
2.17.2

  parent reply	other threads:[~2018-12-21  9:35 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-12-21  9:35 [Qemu-devel] [PATCH v6 00/11] bitmaps: remove x- prefix from QMP api John Snow
2018-12-21  9:35 ` [Qemu-devel] [PATCH v6 01/11] blockdev: abort transactions in reverse order John Snow
2019-01-11 17:52   ` Eric Blake
2019-01-11 19:34     ` Eric Blake
2018-12-21  9:35 ` John Snow [this message]
2018-12-21  9:35 ` [Qemu-devel] [PATCH v6 03/11] blockdev: n-ary bitmap merge John Snow
2018-12-21  9:35 ` [Qemu-devel] [PATCH v6 04/11] block: remove 'x' prefix from experimental bitmap APIs John Snow
2019-01-03 23:21   ` Eric Blake
2019-01-08 10:55     ` Vladimir Sementsov-Ogievskiy
2018-12-21  9:35 ` [Qemu-devel] [PATCH v6 05/11] iotests.py: don't abort if IMGKEYSECRET is undefined John Snow
2018-12-21  9:35 ` [Qemu-devel] [PATCH v6 06/11] iotests: add filter_generated_node_ids John Snow
2018-12-21  9:35 ` [Qemu-devel] [PATCH v6 07/11] iotests: add qmp recursive sorting function John Snow
2018-12-21  9:35 ` [Qemu-devel] [PATCH v6 08/11] iotests: remove default filters from qmp_log John Snow
2018-12-21  9:35 ` [Qemu-devel] [PATCH v6 09/11] iotests: change qmp_log filters to expect QMP objects only John Snow
2018-12-21 12:41   ` Vladimir Sementsov-Ogievskiy
2018-12-21 20:13     ` John Snow
2018-12-24  8:26       ` Vladimir Sementsov-Ogievskiy
2018-12-21  9:35 ` [Qemu-devel] [PATCH v6 10/11] iotests: implement pretty-print for log and qmp_log John Snow
2018-12-21  9:35 ` [Qemu-devel] [PATCH v6 11/11] iotests: add iotest 236 for testing bitmap merge John Snow
2019-01-09  2:50   ` Eric Blake

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20181221093529.23855-3-jsnow@redhat.com \
    --to=jsnow@redhat.com \
    --cc=armbru@redhat.com \
    --cc=eblake@redhat.com \
    --cc=fam@euphon.net \
    --cc=kwolf@redhat.com \
    --cc=mreitz@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=vsementsov@virtuozzo.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).