From nobody Sun Oct 5 21:12:24 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; 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 150350640524363.1435178557208; Wed, 23 Aug 2017 09:40:05 -0700 (PDT) Received: from localhost ([::1]:44732 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dkYhI-0005AP-3z for importer@patchew.org; Wed, 23 Aug 2017 12:40:04 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48136) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dkYbW-0008QR-96 for qemu-devel@nongnu.org; Wed, 23 Aug 2017 12:34:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dkYbV-0005QV-BZ for qemu-devel@nongnu.org; Wed, 23 Aug 2017 12:34:06 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47984) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dkYbO-0005Oq-Se; Wed, 23 Aug 2017 12:33:59 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D695B5F7B5; Wed, 23 Aug 2017 16:33:57 +0000 (UTC) Received: from red.redhat.com (ovpn-124-155.rdu2.redhat.com [10.10.124.155]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9F05E614FE; Wed, 23 Aug 2017 16:33:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com D695B5F7B5 Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=eblake@redhat.com From: Eric Blake To: qemu-devel@nongnu.org Date: Wed, 23 Aug 2017 11:33:44 -0500 Message-Id: <20170823163349.11663-2-eblake@redhat.com> In-Reply-To: <20170823163349.11663-1-eblake@redhat.com> References: <20170823163349.11663-1-eblake@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Wed, 23 Aug 2017 16:33:58 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 1/6] block-backend: Refactor inactivate check 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 , Fam Zheng , "open list:Block layer core" , Max Reitz 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" From: Fam Zheng The logic will be fixed (extended), move it to a separate function. Signed-off-by: Fam Zheng Message-Id: <20170823134242.12080-2-famz@redhat.com> Reviewed-by: Stefan Hajnoczi Signed-off-by: Eric Blake --- block/block-backend.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/block/block-backend.c b/block/block-backend.c index e9798e897d..a3984d2bec 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -192,19 +192,28 @@ static void blk_root_activate(BdrvChild *child, Error= **errp) } } -static int blk_root_inactivate(BdrvChild *child) +static bool blk_can_inactivate(BlockBackend *blk) { - BlockBackend *blk =3D child->opaque; - - if (blk->disable_perm) { - return 0; - } - /* Only inactivate BlockBackends for guest devices (which are inactive= at * this point because the VM is stopped) and unattached monitor-owned * BlockBackends. If there is still any other user like a block job, t= hen * we simply can't inactivate the image. */ - if (!blk->dev && !blk_name(blk)[0]) { + if (blk->dev || blk_name(blk)[0]) { + return true; + } + + return false; +} + +static int blk_root_inactivate(BdrvChild *child) +{ + BlockBackend *blk =3D child->opaque; + + if (blk->disable_perm) { + return 0; + } + + if (!blk_can_inactivate(blk)) { return -EPERM; } --=20 2.13.5