From nobody Thu Nov 6 08:26:14 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.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 1539781586997183.2361372987226; Wed, 17 Oct 2018 06:06:26 -0700 (PDT) Received: from localhost ([::1]:36557 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gClWr-0002Te-PI for importer@patchew.org; Wed, 17 Oct 2018 09:06:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52333) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gClPL-0005IB-7C for qemu-devel@nongnu.org; Wed, 17 Oct 2018 08:58:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gClPH-0006Wx-0j for qemu-devel@nongnu.org; Wed, 17 Oct 2018 08:58:39 -0400 Received: from fanzine.igalia.com ([91.117.99.155]:34301) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gClPG-0004yM-D5; Wed, 17 Oct 2018 08:58:34 -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 1gClOe-0000lP-Hv; Wed, 17 Oct 2018 14:57:56 +0200 Received: from berto by perseus.local with local (Exim 4.89) (envelope-from ) id 1gClOM-0005kc-AS; Wed, 17 Oct 2018 15:57:38 +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=2QernxnL4wjCz1+GxCiCb1pPuiXdmwTkEy4RrkGI2Kc=; b=Y2DNixeARRZhCdEOSc5jDsvv3QN6WwOkQxuS8Fz+0C8oO6p+dkhuQ+Z8tpH4RVTU9uDvCxqYQJvu2cVr7uQus4AceFgC0h0St9uJTFy9XklwB/nbW0RtjWxBO+rwt7dAasM4y6nAsGB7P2A4vWIovhXDxKJc2/h1ZwnAnlqdLSFvWUn8UcKW9uE7yDpITQFUWL1bc7+uxYciao4J8MSIGN5ISAFt1gSicRIW1dOASSHXoU7CyfRuPu/WgeTPGQA9jb8cR6O6lqIhWbl59tpy1+W9wS4UiK0RgHTCVSDfI+/XxkibzmHPWdFYdNLSO8+Qw/QyM5MG0zuepslv86tiDA==; From: Alberto Garcia To: qemu-devel@nongnu.org Date: Wed, 17 Oct 2018 15:57:19 +0300 Message-Id: <0d146a1d1c037c74e9d137d5147ff8ccf679e4a1.1539780785.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 v2 03/14] block: Use bdrv_reopen_set_read_only() in bdrv_backing_update_filename() 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 --- block.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/block.c b/block.c index 40c3a3d30b..39d40f4556 100644 --- a/block.c +++ b/block.c @@ -1058,11 +1058,11 @@ static int bdrv_backing_update_filename(BdrvChild *= c, BlockDriverState *base, const char *filename, Error **errp) { BlockDriverState *parent =3D c->opaque; - int orig_flags =3D bdrv_get_flags(parent); + bool read_only =3D bdrv_is_read_only(parent); int ret; =20 - if (!(orig_flags & BDRV_O_RDWR)) { - ret =3D bdrv_reopen(parent, orig_flags | BDRV_O_RDWR, errp); + if (read_only) { + ret =3D bdrv_reopen_set_read_only(parent, false, errp); if (ret < 0) { return ret; } @@ -1074,8 +1074,8 @@ static int bdrv_backing_update_filename(BdrvChild *c,= BlockDriverState *base, error_setg_errno(errp, -ret, "Could not update backing file link"); } =20 - if (!(orig_flags & BDRV_O_RDWR)) { - bdrv_reopen(parent, orig_flags, NULL); + if (read_only) { + bdrv_reopen_set_read_only(parent, true, NULL); } =20 return ret; --=20 2.11.0