From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60924) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YKrsE-0002vR-Ds for qemu-devel@nongnu.org; Mon, 09 Feb 2015 12:11:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YKrsD-00065S-Kw for qemu-devel@nongnu.org; Mon, 09 Feb 2015 12:11:50 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52512) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YKrsD-000653-5w for qemu-devel@nongnu.org; Mon, 09 Feb 2015 12:11:49 -0500 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t19HBmeB003085 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Mon, 9 Feb 2015 12:11:48 -0500 From: Max Reitz Date: Mon, 9 Feb 2015 12:11:08 -0500 Message-Id: <1423501897-30410-9-git-send-email-mreitz@redhat.com> In-Reply-To: <1423501897-30410-1-git-send-email-mreitz@redhat.com> References: <1423501897-30410-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH v2 08/37] block: Make bdrv_is_inserted() recursive List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Markus Armbruster , Max Reitz , Stefan Hajnoczi , John Snow If bdrv_is_inserted() is called on the top level BDS, it should make sure all nodes in the BDS tree are actually inserted. Signed-off-by: Max Reitz --- block.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/block.c b/block.c index ee7dfba..dafa4b7 100644 --- a/block.c +++ b/block.c @@ -5237,10 +5237,9 @@ bool bdrv_is_inserted(BlockDriverState *bs) if (!drv) { return false; } - if (!drv->bdrv_is_inserted) { - return true; - } - return drv->bdrv_is_inserted(bs); + return (!drv->bdrv_is_inserted || drv->bdrv_is_inserted(bs)) && + (!bs->file || bdrv_is_inserted(bs->file)) && + (!bs->backing_hd || bdrv_is_inserted(bs->backing_hd)); } /** -- 2.1.0