diff options
author | Eric Blake <eblake@redhat.com> | 2018-06-22 10:35:09 -0500 |
---|---|---|
committer | Eric Blake <eblake@redhat.com> | 2018-07-02 14:27:48 -0500 |
commit | 7606c99a0421be7e9d984766fe239f7791a2fd9c (patch) | |
tree | 57f117a0de81eb7d1295604bac1485ea0ccb82e9 /nbd | |
parent | ab08440a4ee09032d1a9cb22fdcab23bc7e1c656 (diff) | |
download | qemu-7606c99a0421be7e9d984766fe239f7791a2fd9c.zip qemu-7606c99a0421be7e9d984766fe239f7791a2fd9c.tar.gz qemu-7606c99a0421be7e9d984766fe239f7791a2fd9c.tar.bz2 |
nbd/server: Fix dirty bitmap logic regression
In my hurry to fix a build failure, I introduced a logic bug.
The assertion conditional is backwards, meaning that qemu will
now abort instead of reporting dirty bitmap status.
The bug can only be tickled by an NBD client using an exported
dirty bitmap (which is still an experimental QMP command), so
it's not the end of the world for supported usage (and neither
'make check' nor qemu-iotests fails); but it also shows that we
really want qemu-io support for reading dirty bitmaps if only
so that I can add iotests coverage to prevent future
brown-bag-of-shame events like this one.
Fixes: 45eb6fb6
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <20180622153509.375130-1-eblake@redhat.com>
Diffstat (limited to 'nbd')
-rw-r--r-- | nbd/server.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nbd/server.c b/nbd/server.c index 50ac8bf..e52b76b 100644 --- a/nbd/server.c +++ b/nbd/server.c @@ -1977,7 +1977,7 @@ static unsigned int bitmap_to_extents(BdrvDirtyBitmap *bitmap, uint64_t offset, bdrv_dirty_bitmap_unlock(bitmap); - assert(offset > end); + assert(offset < end); *length = end - offset; return i; } |