From nobody Wed Nov 5 15:48:19 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: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1497362780044849.3240678880401; Tue, 13 Jun 2017 07:06:20 -0700 (PDT) Received: from localhost ([::1]:43456 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dKmSW-0003tM-Of for importer@patchew.org; Tue, 13 Jun 2017 10:06:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59636) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dKmQT-0001hA-2I for qemu-devel@nongnu.org; Tue, 13 Jun 2017 10:04:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dKmQQ-0005JK-Mf for qemu-devel@nongnu.org; Tue, 13 Jun 2017 10:04:09 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:6801 helo=relay.sw.ru) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dKmQQ-0005HA-Be for qemu-devel@nongnu.org; Tue, 13 Jun 2017 10:04:06 -0400 Received: from kvm.sw.ru (msk-vpn.virtuozzo.com [195.214.232.6]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id v5DE3wr1032717; Tue, 13 Jun 2017 17:04:00 +0300 (MSK) From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org, qemu-devel@nongnu.org Date: Tue, 13 Jun 2017 17:03:40 +0300 Message-Id: <20170613140358.81651-13-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.11.1 In-Reply-To: <20170613140358.81651-1-vsementsov@virtuozzo.com> References: <20170613140358.81651-1-vsementsov@virtuozzo.com> X-detected-operating-system: by eggs.gnu.org: OpenBSD 3.x [fuzzy] X-Received-From: 195.214.232.25 Subject: [Qemu-devel] [PATCH v21 12/30] block: refactor bdrv_reopen_commit 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: kwolf@redhat.com, vsementsov@virtuozzo.com, famz@redhat.com, armbru@redhat.com, mreitz@redhat.com, stefanha@redhat.com, pbonzini@redhat.com, den@openvz.org, jsnow@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add bs local variable to simplify code. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: John Snow --- block.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/block.c b/block.c index 50ba264143..04af7697dc 100644 --- a/block.c +++ b/block.c @@ -2945,9 +2945,11 @@ error: void bdrv_reopen_commit(BDRVReopenState *reopen_state) { BlockDriver *drv; + BlockDriverState *bs; =20 assert(reopen_state !=3D NULL); - drv =3D reopen_state->bs->drv; + bs =3D reopen_state->bs; + drv =3D bs->drv; assert(drv !=3D NULL); =20 /* If there are any driver level actions to take */ @@ -2956,13 +2958,13 @@ void bdrv_reopen_commit(BDRVReopenState *reopen_sta= te) } =20 /* set BDS specific flags now */ - QDECREF(reopen_state->bs->explicit_options); + QDECREF(bs->explicit_options); =20 - reopen_state->bs->explicit_options =3D reopen_state->explicit_option= s; - reopen_state->bs->open_flags =3D reopen_state->flags; - reopen_state->bs->read_only =3D !(reopen_state->flags & BDRV_O_RDWR); + bs->explicit_options =3D reopen_state->explicit_options; + bs->open_flags =3D reopen_state->flags; + bs->read_only =3D !(reopen_state->flags & BDRV_O_RDWR); =20 - bdrv_refresh_limits(reopen_state->bs, NULL); + bdrv_refresh_limits(bs, NULL); } =20 /* --=20 2.11.1