From nobody Mon Feb 9 01:50:42 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 1542031630393971.2793106245692; Mon, 12 Nov 2018 06:07:10 -0800 (PST) Received: from localhost ([::1]:48798 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gMCrt-0006M8-4Y for importer@patchew.org; Mon, 12 Nov 2018 09:07:09 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57659) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gMCmX-0000bV-SI for qemu-devel@nongnu.org; Mon, 12 Nov 2018 09:01:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gMCmH-0001J3-K5 for qemu-devel@nongnu.org; Mon, 12 Nov 2018 09:01:27 -0500 Received: from fanzine.igalia.com ([91.117.99.155]:57644) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gMCmF-0001En-EH; Mon, 12 Nov 2018 09:01:20 -0500 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 1gMCm8-00073r-Tz; Mon, 12 Nov 2018 15:01:13 +0100 Received: from berto by perseus.local with local (Exim 4.89) (envelope-from ) id 1gMClq-0007Cb-By; Mon, 12 Nov 2018 16:00:54 +0200 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=sXxvfZkTk930TafIassTrcmxl3mr/SZ18g1xT9rFYiQ=; b=q4GVo0kuoulegpAgzZmVujcGI0/GXO/2h7P2AswxikDx1F8QdOSaQt+vOIlKsONM0FVOA1iUBN16uo1gl5i+LCw8AvvbSvrxYwzctl15J6rV8bgeHcjxpwcI1Q0J2NnJNJmN6vhi3812jlP4MCo1KW+nMtaPXZdv+VGlopii999qYJpWptmcoHgf1Sgxs8JPd6sexWbq1FwPt8NWDMtRad1qrrELRyPvbSSUTWates36mF3mVRJ4SUhJ8b7wws8BjtAr1xBPz4XpIS4oMNkHx13DO5VWmsevNEkHiaLo1uNZBrNB2wDr1wPoqeu9mc3My5Ca5kIZ0mSoNXyGjPLEsA==; From: Alberto Garcia To: qemu-devel@nongnu.org Date: Mon, 12 Nov 2018 16:00:38 +0200 Message-Id: <9b45afb391dc41271165ca9faf3905dbaaefbf76.1542031058.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 v5 06/16] 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) 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 e5b5eb46e2..20d1d84bab 100644 --- a/blockdev.c +++ b/blockdev.c @@ -4100,7 +4100,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); @@ -4142,13 +4141,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; } } @@ -4164,7 +4160,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