From nobody Mon Feb 9 04:23:01 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 1537369170379334.7106457516127; Wed, 19 Sep 2018 07:59:30 -0700 (PDT) Received: from localhost ([::1]:45820 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g2dwm-0000kT-CQ for importer@patchew.org; Wed, 19 Sep 2018 10:59:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45349) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g2dmG-0008E9-SD for qemu-devel@nongnu.org; Wed, 19 Sep 2018 10:48:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g2dmC-0000JA-Mp for qemu-devel@nongnu.org; Wed, 19 Sep 2018 10:48:28 -0400 Received: from fanzine.igalia.com ([91.117.99.155]:56755) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g2dmC-0000Ev-1H; Wed, 19 Sep 2018 10:48:24 -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 1g2dm9-0003dF-Dq; Wed, 19 Sep 2018 16:48:21 +0200 Received: from berto by perseus.local with local (Exim 4.89) (envelope-from ) id 1g2dlt-0004Th-R0; Wed, 19 Sep 2018 17:48:05 +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=rqIasglyqjzqRhxz0tO0/TMSVX1sHe6/uVMWDeb4U44=; b=AFiuW0GHgtuNiWKEIY+WWOEEPv4rzlw6V3pbLh+0vJ7AAgxvDGyILqyNNF0DW1iBVEM/lp4TxUFhrLAM/KR2uG1sdHkxkFm0mkhtTk/9EekYoflg5CnbxDaFtXgiRbiBPZ9r8wqAoHYR/crwffs83I1gdGdAGyL9V/wBW0WRCag7As2oKQIHwHGbjU2LpKMEcco7TCEDnTr9lmerztnMinPbaw5DGdUPFPV2qnrGhIysGej+IZXGZn/WDJCOGiIQNMOdeCB5Z8vhShMBhnnjkTrnk2Il0EPOFFS1RZbPWhX/2IcyPKfKkr+/KB4LM/wSiarTVrKYMBjqXRgHP3Otvg==; From: Alberto Garcia To: qemu-devel@nongnu.org Date: Wed, 19 Sep 2018 17:47:44 +0300 Message-Id: <5f1c063ccfaf20fde5d1334652648f054b0f9d8a.1537367701.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 06/14] block: Use bdrv_reopen_set_read_only() in stream_start/complete() 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/stream.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/block/stream.c b/block/stream.c index 9264b68a1e..07201f3df5 100644 --- a/block/stream.c +++ b/block/stream.c @@ -34,7 +34,7 @@ typedef struct StreamBlockJob { BlockDriverState *base; BlockdevOnError on_error; char *backing_file_str; - int bs_flags; + bool bs_read_only; } StreamBlockJob; =20 static int coroutine_fn stream_populate(BlockBackend *blk, @@ -86,10 +86,10 @@ static void stream_complete(Job *job, void *opaque) =20 out: /* Reopen the image back in read-only mode if necessary */ - if (s->bs_flags !=3D bdrv_get_flags(bs)) { + if (s->bs_read_only) { /* Give up write permissions before making it read-only */ blk_set_perm(bjob->blk, 0, BLK_PERM_ALL, &error_abort); - bdrv_reopen(bs, s->bs_flags, NULL); + bdrv_reopen_set_read_only(bs, true, NULL); } =20 g_free(s->backing_file_str); @@ -225,12 +225,12 @@ void stream_start(const char *job_id, BlockDriverStat= e *bs, { StreamBlockJob *s; BlockDriverState *iter; - int orig_bs_flags; + int bs_read_only; =20 /* Make sure that the image is opened in read-write mode */ - orig_bs_flags =3D bdrv_get_flags(bs); - if (!(orig_bs_flags & BDRV_O_RDWR)) { - if (bdrv_reopen(bs, orig_bs_flags | BDRV_O_RDWR, errp) !=3D 0) { + bs_read_only =3D bdrv_is_read_only(bs); + if (bs_read_only) { + if (bdrv_reopen_set_read_only(bs, false, errp) !=3D 0) { return; } } @@ -260,7 +260,7 @@ void stream_start(const char *job_id, BlockDriverState = *bs, =20 s->base =3D base; s->backing_file_str =3D g_strdup(backing_file_str); - s->bs_flags =3D orig_bs_flags; + s->bs_read_only =3D bs_read_only; =20 s->on_error =3D on_error; trace_stream_start(bs, base, s); @@ -268,7 +268,7 @@ void stream_start(const char *job_id, BlockDriverState = *bs, return; =20 fail: - if (orig_bs_flags !=3D bdrv_get_flags(bs)) { - bdrv_reopen(bs, orig_bs_flags, NULL); + if (bs_read_only) { + bdrv_reopen_set_read_only(bs, true, NULL); } } --=20 2.11.0