From nobody Fri May 2 12:48:02 2025
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as
permitted sender) client-ip=208.118.235.17;
envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Authentication-Results: mx.zoho.com;
spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted
sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by
mx.zohomail.com
with SMTPS id 1492782860039335.86692947461245;
Fri, 21 Apr 2017 06:54:20 -0700 (PDT)
Received: from localhost ([::1]:59781 helo=lists.gnu.org)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from <qemu-devel-bounces+importer=patchew.org@nongnu.org>)
id 1d1Z0s-0002S9-GS
for importer@patchew.org; Fri, 21 Apr 2017 09:54:18 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:51727)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from <jcody@redhat.com>) id 1d1Yts-00055I-LS
for qemu-devel@nongnu.org; Fri, 21 Apr 2017 09:47:06 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from <jcody@redhat.com>) id 1d1Ytr-0002Ta-LM
for qemu-devel@nongnu.org; Fri, 21 Apr 2017 09:47:04 -0400
Received: from mx1.redhat.com ([209.132.183.28]:34030)
by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)
(Exim 4.71) (envelope-from <jcody@redhat.com>)
id 1d1Ytk-0002R4-Rt; Fri, 21 Apr 2017 09:46:56 -0400
Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com
[10.5.11.12])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by mx1.redhat.com (Postfix) with ESMTPS id C2D197E9CB;
Fri, 21 Apr 2017 13:46:55 +0000 (UTC)
Received: from localhost (ovpn-116-76.phx2.redhat.com [10.3.116.76])
by smtp.corp.redhat.com (Postfix) with ESMTPS id 744C2AE0EA;
Fri, 21 Apr 2017 13:46:55 +0000 (UTC)
DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com C2D197E9CB
Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com;
dmarc=none (p=none dis=none) header.from=redhat.com
Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com;
spf=pass smtp.mailfrom=jcody@redhat.com
DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com C2D197E9CB
From: Jeff Cody <jcody@redhat.com>
To: qemu-block@nongnu.org
Date: Fri, 21 Apr 2017 09:46:41 -0400
Message-Id: <20170421134644.10239-10-jcody@redhat.com>
In-Reply-To: <20170421134644.10239-1-jcody@redhat.com>
References: <20170421134644.10239-1-jcody@redhat.com>
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12
X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16
(mx1.redhat.com [10.5.110.26]);
Fri, 21 Apr 2017 13:46:55 +0000 (UTC)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
[fuzzy]
X-Received-From: 209.132.183.28
Subject: [Qemu-devel] [PULL 09/12] block: use bdrv_can_set_read_only()
during reopen
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Cc: peter.maydell@linaro.org, jcody@redhat.com, qemu-devel@nongnu.org
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+importer=patchew.org@nongnu.org>
X-ZohoMail: RSF_0 Z_629925259 SPT_0
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Signed-off-by: Jeff Cody <jcody@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Message-id: 00aed7ffdd7be4b9ed9ce1007d50028a72b34ebe.1491597120.git.jcody@r=
edhat.com
---
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;
=20
assert(reopen_state !=3D NULL);
assert(reopen_state->bs->drv !=3D NULL);
@@ -2817,12 +2818,13 @@ int bdrv_reopen_prepare(BDRVReopenState *reopen_sta=
te, BlockReopenQueue *queue,
qdict_put(reopen_state->options, "driver", qstring_from_str(value)=
);
}
=20
- /* 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_RD=
WR is
+ * not set, or if the BDS still has copy_on_read enabled */
+ read_only =3D !(reopen_state->flags & BDRV_O_RDWR);
+ ret =3D bdrv_can_set_read_only(reopen_state->bs, read_only, &local_err=
);
+ if (local_err) {
+ error_propagate(errp, local_err);
goto error;
}
=20
--=20
2.9.3