From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42494) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YKtod-0007zg-SL for qemu-devel@nongnu.org; Mon, 09 Feb 2015 14:16:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YKtoZ-0005ZM-Rx for qemu-devel@nongnu.org; Mon, 09 Feb 2015 14:16:15 -0500 Received: from mx1.redhat.com ([209.132.183.28]:59840) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YKtoZ-0005ZC-IA for qemu-devel@nongnu.org; Mon, 09 Feb 2015 14:16:11 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t19JGAMb009800 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Mon, 9 Feb 2015 14:16:10 -0500 Message-ID: <54D90779.9080409@redhat.com> Date: Mon, 09 Feb 2015 12:16:09 -0700 From: Eric Blake MIME-Version: 1.0 References: <1423501897-30410-1-git-send-email-mreitz@redhat.com> <1423501897-30410-9-git-send-email-mreitz@redhat.com> In-Reply-To: <1423501897-30410-9-git-send-email-mreitz@redhat.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="OQSomslgf2CBRL7235RDuR66h43vH2Mo9" Subject: Re: [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: Max Reitz , qemu-devel@nongnu.org Cc: Kevin Wolf , John Snow , Markus Armbruster , Stefan Hajnoczi This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --OQSomslgf2CBRL7235RDuR66h43vH2Mo9 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 02/09/2015 10:11 AM, Max Reitz wrote: > If bdrv_is_inserted() is called on the top level BDS, it should make > sure all nodes in the BDS tree are actually inserted. >=20 > Signed-off-by: Max Reitz > --- > block.c | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) Reviewed-by: Eric Blake >=20 > 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)= ); > } > =20 > /** >=20 --=20 Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org --OQSomslgf2CBRL7235RDuR66h43vH2Mo9 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 Comment: Public key at http://people.redhat.com/eblake/eblake.gpg Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQEcBAEBCAAGBQJU2Qd5AAoJEKeha0olJ0NqZuQH/jNJM+BtKmqwDrmR3LfMHtRh RbgBKVhv82l0Kv5Jx01kXywizc7bPzGA1RON7ckzaNw5X1LSTdzsrhijXeYjEoKF 6kv8a6hzsS492MElIaKo3E25U4wEBq/RneqzyyTPwLzbNCWDsK1MMrj/W13IsRgR xVp66M0CU2rYS3fF9Qh/UqfYRUrSB8O2VSKxzokdd6GJcYSDgRYkq4MkByfqAja9 c/6lw55GbL8HMvNuzdTZAvK6ZNwDu+B2RLafKUMXNZv/4oWDFnCW8g74CdwqzmMj odNIWZsCloRvZzfYZa6uojQo2XhzEIUpoW90HhcgMKVOl2etD9nVmP3mvw/4sp4= =KHtX -----END PGP SIGNATURE----- --OQSomslgf2CBRL7235RDuR66h43vH2Mo9--