summaryrefslogtreecommitdiff
path: root/block/qapi.c
diff options
context:
space:
mode:
authorJohn Snow <jsnow@redhat.com>2015-12-14 14:55:13 -0500
committerMax Reitz <mreitz@redhat.com>2015-12-18 14:36:17 +0100
commit12dcb1c0183bba4499d9c8bd37fa7112549cafd7 (patch)
tree328cb015ab74f3e86532c6e2a6db4748e759669b /block/qapi.c
parent548e1ff37982424f5c605c67471b691ab5c8d1b1 (diff)
downloadqemu-12dcb1c0183bba4499d9c8bd37fa7112549cafd7.tar.gz
block/qapi: always report full_backing_filename
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 <jsnow@redhat.com> Reviewed-by: Max Reitz <mreitz@redhat.com> Message-id: 1450122916-4706-3-git-send-email-jsnow@redhat.com Signed-off-by: Max Reitz <mreitz@redhat.com>
Diffstat (limited to 'block/qapi.c')
-rw-r--r--block/qapi.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/block/qapi.c b/block/qapi.c
index 563dd3185d..3d8e4341c3 100644
--- a/block/qapi.c
+++ b/block/qapi.c
@@ -251,9 +251,10 @@ void bdrv_query_image_info(BlockDriverState *bs,
return;
}
- if (strcmp(backing_filename, backing_filename2) != 0) {
- info->full_backing_filename =
- 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. */
+ if (backing_filename2) {
+ info->full_backing_filename = g_strdup(backing_filename2);
info->has_full_backing_filename = true;
}