From: John Snow <jsnow@redhat.com>
Date: Tue, 12 Mar 2019 16:05:49 +0000 (-0400)
Subject: block/dirty-bitmaps: prohibit removing readonly bitmaps
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=c3edf13cd1efdb5a59e0ae4f15e63080ffb35525;p=qemu.git

block/dirty-bitmaps: prohibit removing readonly bitmaps

Remove is an inherently RW operation, so this will fail anyway, but
we can fail it very quickly instead of trying and failing, so do so.

Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-id: 20190301191545.8728-6-jsnow@redhat.com
Signed-off-by: John Snow <jsnow@redhat.com>
---

diff --git a/blockdev.c b/blockdev.c
index dd841fc5db..1391f4200a 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -2884,7 +2884,8 @@ void qmp_block_dirty_bitmap_remove(const char *node, const char *name,
         return;
     }
 
-    if (bdrv_dirty_bitmap_check(bitmap, BDRV_BITMAP_BUSY, errp)) {
+    if (bdrv_dirty_bitmap_check(bitmap, BDRV_BITMAP_BUSY | BDRV_BITMAP_RO,
+                                errp)) {
         return;
     }