From: John Snow <jsnow@redhat.com>
Date: Mon, 14 Dec 2015 19:55:12 +0000 (-0500)
Subject: block/qapi: do not redundantly print "actual path"
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=548e1ff37982424f5c605c67471b691ab5c8d1b1;p=qemu.git

block/qapi: do not redundantly print "actual path"

If it happens to match the backing path, that was the actual path.

Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-id: 1450122916-4706-2-git-send-email-jsnow@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---

diff --git a/block/qapi.c b/block/qapi.c
index c0e877e07e..563dd3185d 100644
--- a/block/qapi.c
+++ b/block/qapi.c
@@ -676,7 +676,9 @@ void bdrv_image_info_dump(fprintf_function func_fprintf, void *f,
 
     if (info->has_backing_filename) {
         func_fprintf(f, "backing file: %s", info->backing_filename);
-        if (info->has_full_backing_filename) {
+        if (info->has_full_backing_filename &&
+            (strcmp(info->backing_filename,
+                    info->full_backing_filename) != 0)) {
             func_fprintf(f, " (actual path: %s)", info->full_backing_filename);
         }
         func_fprintf(f, "\n");