From bda8e9c91bc93d9185e9094b2a188fff44173a3e Mon Sep 17 00:00:00 2001 From: Jeffrey Cody Date: Wed, 26 Apr 2017 20:08:53 +0200 Subject: [PATCH 07/11] block: use bdrv_can_set_read_only() during reopen RH-Author: Jeffrey Cody Message-id: Patchwork-id: 74901 O-Subject: [RHEV-7.4 qemu-kvm-rhev 6/8] block: use bdrv_can_set_read_only() during reopen Bugzilla: 1189998 RH-Acked-by: John Snow RH-Acked-by: Stefan Hajnoczi RH-Acked-by: Max Reitz Signed-off-by: Jeff Cody Reviewed-by: Stefan Hajnoczi Reviewed-by: John Snow Message-id: 00aed7ffdd7be4b9ed9ce1007d50028a72b34ebe.1491597120.git.jcody@redhat.com (cherry picked from commit 3d8ce171cb4a62b55727bc949e2e9427f77de6fb) Signed-off-by: Miroslav Rezanina --- block.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/block.c b/block.c index 84f12f7..9fca814 100644 --- a/block.c +++ b/block.c @@ -2789,6 +2789,7 @@ int bdrv_reopen_prepare(BDRVReopenState *reopen_state, BlockReopenQueue *queue, BlockDriver *drv; QemuOpts *opts; const char *value; + bool read_only; assert(reopen_state != NULL); assert(reopen_state->bs->drv != NULL); @@ -2817,12 +2818,13 @@ int bdrv_reopen_prepare(BDRVReopenState *reopen_state, BlockReopenQueue *queue, qdict_put(reopen_state->options, "driver", qstring_from_str(value)); } - /* if we are to stay read-only, do not allow permission change - * to r/w */ - if (!(reopen_state->bs->open_flags & BDRV_O_ALLOW_RDWR) && - reopen_state->flags & BDRV_O_RDWR) { - error_setg(errp, "Node '%s' is read only", - bdrv_get_device_or_node_name(reopen_state->bs)); + /* If we are to stay read-only, do not allow permission change + * to r/w. Attempting to set to r/w may fail if either BDRV_O_ALLOW_RDWR is + * not set, or if the BDS still has copy_on_read enabled */ + read_only = !(reopen_state->flags & BDRV_O_RDWR); + ret = bdrv_can_set_read_only(reopen_state->bs, read_only, &local_err); + if (local_err) { + error_propagate(errp, local_err); goto error; } -- 1.8.3.1