diff options
| author | Jeff Cody <jcody@redhat.com> | 2017-04-07 16:55:26 -0400 |
|---|---|---|
| committer | Jeff Cody <jcody@redhat.com> | 2017-04-24 15:09:33 -0400 |
| commit | e2b8247a322cd92945785edf25f09e6b3e8285f9 (patch) | |
| tree | e63597037c31624af5aefaa18551b000d52dc912 /block/dmg.c | |
| parent | fe5241bfe3fb61ec3f589ceacd91c1469bfd400f (diff) | |
block: do not set BDS read_only if copy_on_read enabled
A few block drivers will set the BDS read_only flag from their
.bdrv_open() function. This means the bs->read_only flag could
be set after we enable copy_on_read, as the BDRV_O_COPY_ON_READ
flag check occurs prior to the call to bdrv->bdrv_open().
This adds an error return to bdrv_set_read_only(), and an error will be
return if we try to set the BDS to read_only while copy_on_read is
enabled.
This patch also changes the behavior of vvfat. Before, vvfat could
override the drive 'readonly' flag with its own, internal 'rw' flag.
For instance, this -drive parameter would result in a writable image:
"-drive format=vvfat,dir=/tmp/vvfat,rw,if=virtio,readonly=on"
This is not correct. Now, attempting to use the above -drive parameter
will result in an error (i.e., 'rw' is incompatible with 'readonly=on').
Signed-off-by: Jeff Cody <jcody@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Message-id: 0c5b4c1cc2c651471b131f21376dfd5ea24d2196.1491597120.git.jcody@redhat.com
Diffstat (limited to 'block/dmg.c')
| -rw-r--r-- | block/dmg.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/block/dmg.c b/block/dmg.c index 27ce4a62d1..900ae5a678 100644 --- a/block/dmg.c +++ b/block/dmg.c @@ -419,8 +419,12 @@ static int dmg_open(BlockDriverState *bs, QDict *options, int flags, return -EINVAL; } + ret = bdrv_set_read_only(bs, true, errp); + if (ret < 0) { + return ret; + } + block_module_load_one("dmg-bz2"); - bdrv_set_read_only(bs, true); s->n_chunks = 0; s->offsets = s->lengths = s->sectors = s->sectorcounts = NULL; |