From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44583) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a8W7E-0008Lk-Lg for qemu-devel@nongnu.org; Mon, 14 Dec 2015 11:36:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a8W7B-0005hg-A1 for qemu-devel@nongnu.org; Mon, 14 Dec 2015 11:36:48 -0500 References: <1449883528-26477-1-git-send-email-jsnow@redhat.com> <1449883528-26477-3-git-send-email-jsnow@redhat.com> From: Max Reitz Message-ID: <566EF00B.1050403@redhat.com> Date: Mon, 14 Dec 2015 17:36:27 +0100 MIME-Version: 1.0 In-Reply-To: <1449883528-26477-3-git-send-email-jsnow@redhat.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="WCOPsgUfRAD5Kixs7BL81A99XAmoWVKfG" Subject: Re: [Qemu-devel] [PATCH v2 2/4] block/qapi: always report full_backing_filename List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: John Snow , qemu-block@nongnu.org Cc: kwolf@redhat.com, qemu-devel@nongnu.org This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --WCOPsgUfRAD5Kixs7BL81A99XAmoWVKfG Content-Type: text/plain; charset=iso-8859-15 Content-Transfer-Encoding: quoted-printable On 12.12.2015 02:25, John Snow wrote: > Always report full_backing_filename, even if it's the same as > backing_filename. In the next patch, full_backing_filename may be > omitted if it cannot be generated instead of allowing e.g. drive_query > to abort if it runs into this scenario. >=20 > The presence or absence of the "full" field becomes useful information.= >=20 > Signed-off-by: John Snow > --- > block/qapi.c | 7 ++++--- > tests/qemu-iotests/043.out | 2 ++ > 2 files changed, 6 insertions(+), 3 deletions(-) >=20 > diff --git a/block/qapi.c b/block/qapi.c > index 01569da..0e6b333 100644 > --- a/block/qapi.c > +++ b/block/qapi.c > @@ -251,9 +251,10 @@ void bdrv_query_image_info(BlockDriverState *bs, > return; > } > =20 > - if (strcmp(backing_filename, backing_filename2) !=3D 0) { > - info->full_backing_filename =3D > - g_strdup(backing_filename2); > + /* Always report the full_backing_filename if present, even if= it's the > + * same as backing_filename. That they are same is useful info= =2E */ > + if (backing_filename2) { Is there a reason for this non-NULL check? Because it always is non-NULL right now. Max > + info->full_backing_filename =3D g_strdup(backing_filename2= ); > info->has_full_backing_filename =3D true; > } > =20 > diff --git a/tests/qemu-iotests/043.out b/tests/qemu-iotests/043.out > index 33f8cc3..b37d2a3 100644 > --- a/tests/qemu-iotests/043.out > +++ b/tests/qemu-iotests/043.out > @@ -44,6 +44,7 @@ cluster_size: 65536 > "filename": "TEST_DIR/t.IMGFMT", > "cluster-size": 65536, > "format": "IMGFMT", > + "full-backing-filename": "TEST_DIR/t.IMGFMT.2.base", > "backing-filename": "TEST_DIR/t.IMGFMT.2.base", > "dirty-flag": false > }, > @@ -52,6 +53,7 @@ cluster_size: 65536 > "filename": "TEST_DIR/t.IMGFMT.2.base", > "cluster-size": 65536, > "format": "IMGFMT", > + "full-backing-filename": "TEST_DIR/t.IMGFMT.1.base", > "backing-filename": "TEST_DIR/t.IMGFMT.1.base", > "dirty-flag": false > }, >=20 --WCOPsgUfRAD5Kixs7BL81A99XAmoWVKfG Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBCAAGBQJWbvALAAoJEDuxQgLoOKytcasH/3+lldVDsJxTsv8doP5OtVj6 /R3Z6B243bIirrO1gfWH3VejjKTBbQegAjCC93d1skUSfkbSlBDDiS8//CKmvlqF XodjRMuarus74VFlwoBQ/4ZYSjRsPuMclY0qN5bzlPAd2Jp81KlofBeE73/hY4ri 77pnQw8J063u3vosiB1RHlg/Kgud1XK83nagsvnw+kUaobC8i8t6MVDoo/J1SbMZ V7IoSD/5/duQecNBCWk2j0lqdBFoijWoHRl6U1YGy0rg7+C/8pj/+CggNjCzuUuh TtJ9m6SQEAJBE1uyrtnFJBXIuV++pcqcIN3MVMvI027et7CuUXtw36brzbvsOcg= =ubaV -----END PGP SIGNATURE----- --WCOPsgUfRAD5Kixs7BL81A99XAmoWVKfG--