diff options
| author | Alberto Garcia | 2018-11-12 15:00:48 +0100 |
|---|---|---|
| committer | Kevin Wolf | 2018-11-22 16:43:52 +0100 |
| commit | 2a3d4331fa2d40708188b8000f98ff1f7dcd33bc (patch) | |
| tree | c08d025f93ad66e5d267b6a5954d639c580a36ab /block.c | |
| parent | scsi-disk: Fix crash if underlying host file or disk returns error (diff) | |
| download | qemu-2a3d4331fa2d40708188b8000f98ff1f7dcd33bc.tar.gz qemu-2a3d4331fa2d40708188b8000f98ff1f7dcd33bc.tar.xz qemu-2a3d4331fa2d40708188b8000f98ff1f7dcd33bc.zip | |
block: Fix update of BDRV_O_AUTO_RDONLY in update_flags_from_options()
Commit e35bdc123a4ace9f4d3fcca added the auto-read-only option and the
code to update its corresponding flag in update_flags_from_options(),
but forgot to clear the flag if auto-read-only is false.
Signed-off-by: Alberto Garcia <berto@igalia.com>
Reported-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block.c')
| -rw-r--r-- | block.c | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -1137,7 +1137,7 @@ static int bdrv_open_flags(BlockDriverState *bs, int flags) static void update_flags_from_options(int *flags, QemuOpts *opts) { - *flags &= ~BDRV_O_CACHE_MASK; + *flags &= ~(BDRV_O_CACHE_MASK | BDRV_O_RDWR | BDRV_O_AUTO_RDONLY); assert(qemu_opt_find(opts, BDRV_OPT_CACHE_NO_FLUSH)); if (qemu_opt_get_bool_del(opts, BDRV_OPT_CACHE_NO_FLUSH, false)) { @@ -1149,8 +1149,6 @@ static void update_flags_from_options(int *flags, QemuOpts *opts) *flags |= BDRV_O_NOCACHE; } - *flags &= ~BDRV_O_RDWR; - assert(qemu_opt_find(opts, BDRV_OPT_READ_ONLY)); if (!qemu_opt_get_bool_del(opts, BDRV_OPT_READ_ONLY, false)) { *flags |= BDRV_O_RDWR; |