diff options
| -rw-r--r-- | block/qapi.c | 7 | ||||
| -rw-r--r-- | tests/qemu-iotests/043.out | 2 |
2 files changed, 6 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; } diff --git a/tests/qemu-iotests/043.out b/tests/qemu-iotests/043.out index 33f8cc37d3..b37d2a3807 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 }, |