From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53785) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZHF9O-0004Yd-EG for qemu-devel@nongnu.org; Mon, 20 Jul 2015 13:46:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZHF9N-0000pg-8r for qemu-devel@nongnu.org; Mon, 20 Jul 2015 13:46:50 -0400 From: Max Reitz Date: Mon, 20 Jul 2015 19:45:33 +0200 Message-Id: <1437414365-11881-7-git-send-email-mreitz@redhat.com> In-Reply-To: <1437414365-11881-1-git-send-email-mreitz@redhat.com> References: <1437414365-11881-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH v4 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 , Alberto Garcia , John Snow , qemu-devel@nongnu.org, Markus Armbruster , Stefan Hajnoczi , Max Reitz 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 Reviewed-by: Alberto Garcia --- block.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/block.c b/block.c index 494e08e..1d27b6a 100644 --- a/block.c +++ b/block.c @@ -3235,10 +3235,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.6