block/qcow2: improve error message in qcow2_inactivate

[qemu.git] / block / cloop.c

diff --git a/block/cloop.c b/block/cloop.c
index a6c7b9dbe642c8d262a8ef5eac9ddad8d0c707de..2be68987bd9172c52937e159b8d8a38af08dcb0b 100644 (file)
--- a/block/cloop.c
+++ b/block/cloop.c
@@ -23,6 +23,7 @@
  */
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qemu/error-report.h"
 #include "qemu-common.h"
 #include "block/block_int.h"
 #include "qemu/module.h"
@@ -72,7 +73,16 @@ static int cloop_open(BlockDriverState *bs, QDict *options, int flags,
         return -EINVAL;
     }
 
-    bs->read_only = true;
+    if (!bdrv_is_read_only(bs)) {
+        error_report("Opening cloop images without an explicit read-only=on "
+                     "option is deprecated. Future versions will refuse to "
+                     "open the image instead of automatically marking the "
+                     "image read-only.");
+        ret = bdrv_set_read_only(bs, true, errp);
+        if (ret < 0) {
+            return ret;
+        }
+    }
 
     /* read header */
     ret = bdrv_pread(bs->file, 128, &s->block_size, 4);