Patchwork [04/17] blockdev: Clean up how readonly persists across virtual media change

login
register
mail settings
Submitter Kevin Wolf
Date July 6, 2010, 3:33 p.m.
Message ID <1278430406-18667-5-git-send-email-kwolf@redhat.com>
Download mbox | patch
Permalink /patch/58031/
State New
Headers show

Comments

Kevin Wolf - July 6, 2010, 3:33 p.m.
From: Markus Armbruster <armbru@redhat.com>

Since commit cb4e5f8e, monitor command change makes the new media
readonly iff the type hint is BDRV_TYPE_CDROM, i.e. the drive was
created with media=cdrom.  The intention is to avoid changing a block
device's read-only-ness.  However, BDRV_TYPE_CDROM is only a hint.  It
is currently sufficent for read-only.  But it's not necessary, and it
may not remain sufficient.

Use bdrv_is_read_only() instead.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 blockdev.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Patch

diff --git a/blockdev.c b/blockdev.c
index be88098..0a9dec3 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -589,7 +589,7 @@  int do_change_block(Monitor *mon, const char *device,
     if (eject_device(mon, bs, 0) < 0) {
         return -1;
     }
-    bdrv_flags = bdrv_get_type_hint(bs) == BDRV_TYPE_CDROM ? 0 : BDRV_O_RDWR;
+    bdrv_flags = bdrv_is_read_only(bs) ? 0 : BDRV_O_RDWR;
     if (bdrv_open(bs, filename, bdrv_flags, drv) < 0) {
         qerror_report(QERR_OPEN_FILE_FAILED, filename);
         return -1;