From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45103) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a8W8v-00018v-T6 for qemu-devel@nongnu.org; Mon, 14 Dec 2015 11:38:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a8W8q-0006Tr-Jy for qemu-devel@nongnu.org; Mon, 14 Dec 2015 11:38:33 -0500 References: <1449883528-26477-1-git-send-email-jsnow@redhat.com> <1449883528-26477-3-git-send-email-jsnow@redhat.com> <566EF00B.1050403@redhat.com> From: John Snow Message-ID: <566EF079.3020800@redhat.com> Date: Mon, 14 Dec 2015 11:38:17 -0500 MIME-Version: 1.0 In-Reply-To: <566EF00B.1050403@redhat.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable 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: Max Reitz , qemu-block@nongnu.org Cc: kwolf@redhat.com, qemu-devel@nongnu.org On 12/14/2015 11:36 AM, Max Reitz wrote: > 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. >> >> The presence or absence of the "full" field becomes useful information= . >> >> Signed-off-by: John Snow >> --- >> block/qapi.c | 7 ++++--- >> tests/qemu-iotests/043.out | 2 ++ >> 2 files changed, 6 insertions(+), 3 deletions(-) >> >> 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 i= f it's the >> + * same as backing_filename. That they are same is useful inf= o. */ >> + if (backing_filename2) { >=20 > Is there a reason for this non-NULL check? Because it always is non-NUL= L > right now. >=20 > Max >=20 No, I was just being convenient with re-ordering patches. It can be NULL by the end of the set. I'll clean it if there's other work to do. >> + info->full_backing_filename =3D g_strdup(backing_filename= 2); >> 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 >=20 --=20 =E2=80=94js