From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52618) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YFm8c-0005Vp-3o for qemu-devel@nongnu.org; Mon, 26 Jan 2015 11:03:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YFm8U-00055A-Fg for qemu-devel@nongnu.org; Mon, 26 Jan 2015 11:03:42 -0500 Received: from mx1.redhat.com ([209.132.183.28]:54744) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YFm8U-000550-7n for qemu-devel@nongnu.org; Mon, 26 Jan 2015 11:03:34 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t0QG3Xh0015063 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Mon, 26 Jan 2015 11:03:33 -0500 From: Max Reitz Date: Mon, 26 Jan 2015 11:02:41 -0500 Message-Id: <1422288204-29271-8-git-send-email-mreitz@redhat.com> In-Reply-To: <1422288204-29271-1-git-send-email-mreitz@redhat.com> References: <1422288204-29271-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH 07/50] 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 , Fam Zheng , Jeff Cody , Markus Armbruster , Max Reitz , Stefan Hajnoczi , john@redhat.com 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 | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/block.c b/block.c index 4a5f8fc..aff7682 100644 --- a/block.c +++ b/block.c @@ -5208,11 +5208,12 @@ int bdrv_is_inserted(BlockDriverState *bs) { BlockDriver *drv = bs->drv; - if (!drv) + if (!drv) { return 0; - if (!drv->bdrv_is_inserted) - return 1; - 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