From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57071) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z0Eah-000057-5J for qemu-devel@nongnu.org; Wed, 03 Jun 2015 15:44:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z0Eag-0000Qp-C8 for qemu-devel@nongnu.org; Wed, 03 Jun 2015 15:44:43 -0400 From: Max Reitz Date: Wed, 3 Jun 2015 21:43:47 +0200 Message-Id: <1433360659-1915-7-git-send-email-mreitz@redhat.com> In-Reply-To: <1433360659-1915-1-git-send-email-mreitz@redhat.com> References: <1433360659-1915-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH v3 06/38] block: Make bdrv_is_inserted() recursive List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: Kevin Wolf , qemu-devel@nongnu.org, Markus Armbruster , Stefan Hajnoczi , Max Reitz , 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 Reviewed-by: Eric Blake --- block.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/block.c b/block.c index fdb5612..d6479e6 100644 --- a/block.c +++ b/block.c @@ -2997,10 +2997,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.4.1