From nobody Mon Feb 9 01:50:28 2026 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.zohomail.com; dkim=fail; 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: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1539952626180317.2458417536718; Fri, 19 Oct 2018 05:37:06 -0700 (PDT) Received: from localhost ([::1]:50019 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gDU1U-0005WN-Tg for importer@patchew.org; Fri, 19 Oct 2018 08:37:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38940) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gDTrU-0004uk-2Q for qemu-devel@nongnu.org; Fri, 19 Oct 2018 08:26:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gDTrQ-0000SK-1y for qemu-devel@nongnu.org; Fri, 19 Oct 2018 08:26:39 -0400 Received: from fanzine.igalia.com ([91.117.99.155]:51794) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gDTrH-00074Y-1v; Fri, 19 Oct 2018 08:26:32 -0400 Received: from [194.100.51.2] (helo=perseus.local) by fanzine.igalia.com with esmtpsa (Cipher TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim) id 1gDTq2-00081B-E0; Fri, 19 Oct 2018 14:25:10 +0200 Received: from berto by perseus.local with local (Exim 4.89) (envelope-from ) id 1gDTpj-0002LH-O7; Fri, 19 Oct 2018 15:24:51 +0300 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=References:In-Reply-To:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=Ivx2YkR0hmEcXyGq/m2nT5rENX6jDLMgKzukRWaKA3k=; b=hcMTvCsoa/jUXZKMT/hGGXd99XjYkZ4cxD1uKLakFkqmGU88aF3FXdqsLRO1Qc8GxcoiYmANKurzsICyw+Z7tXnrFd+aSmkw3ThICMJ6FULH+sWFJdgNRLHqWQJ8s5QKeUIAkRE9Ni/w/IiNYcd6csDm3BDNN9kjv/MqiDHbukosvUCsBcin2IuI+aOOTOZpZ4XyqUwfaYUoPrQ2HHbCBsCdUe7z0CyT9YWqL4BhNoqTxv6St0HjBHcLbSi+a65+bvONlr5GXPnkzYDzMvRQP0IN8gXXtcTcw3/IqSmuBUrJHL/Cb26DVdjJCzIvVEZdd0tDGeDiXhpTHgmWWwvhqA==; From: Alberto Garcia To: qemu-devel@nongnu.org Date: Fri, 19 Oct 2018 15:24:37 +0300 Message-Id: <8cc178a07169242ad995973fddbebb7efde557b9.1539950487.git.berto@igalia.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] [fuzzy] X-Received-From: 91.117.99.155 Subject: [Qemu-devel] [PATCH v3 06/15] block: Use bdrv_reopen_set_read_only() in qmp_change_backing_file() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Alberto Garcia , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This patch replaces the bdrv_reopen() calls that set and remove the BDRV_O_RDWR flag with the new bdrv_reopen_set_read_only() function. Signed-off-by: Alberto Garcia Reviewed-by: Max Reitz --- blockdev.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/blockdev.c b/blockdev.c index a8755bd908..f64569795c 100644 --- a/blockdev.c +++ b/blockdev.c @@ -4064,7 +4064,6 @@ void qmp_change_backing_file(const char *device, BlockDriverState *image_bs =3D NULL; Error *local_err =3D NULL; bool ro; - int open_flags; int ret; =20 bs =3D qmp_get_root_bs(device, errp); @@ -4106,13 +4105,10 @@ void qmp_change_backing_file(const char *device, } =20 /* if not r/w, reopen to make r/w */ - open_flags =3D image_bs->open_flags; ro =3D bdrv_is_read_only(image_bs); =20 if (ro) { - bdrv_reopen(image_bs, open_flags | BDRV_O_RDWR, &local_err); - if (local_err) { - error_propagate(errp, local_err); + if (bdrv_reopen_set_read_only(image_bs, false, errp) !=3D 0) { goto out; } } @@ -4128,7 +4124,7 @@ void qmp_change_backing_file(const char *device, } =20 if (ro) { - bdrv_reopen(image_bs, open_flags, &local_err); + bdrv_reopen_set_read_only(image_bs, true, &local_err); error_propagate(errp, local_err); } =20 --=20 2.11.0