From 5c9d9ca59735d245599884cf1db744c2b403367c Mon Sep 17 00:00:00 2001 From: John Snow Date: Mon, 14 Dec 2015 14:55:14 -0500 Subject: [PATCH] block/qapi: explicitly warn if !has_full_backing_filename Disambiguate "Backing filename and full backing filename are equivalent" from "full backing filename could not be determined." Signed-off-by: John Snow Message-id: 1450122916-4706-4-git-send-email-jsnow@redhat.com Reviewed-by: Max Reitz Signed-off-by: Max Reitz --- block/qapi.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/block/qapi.c b/block/qapi.c index 3d8e4341c3..5587c6471c 100644 --- a/block/qapi.c +++ b/block/qapi.c @@ -677,9 +677,10 @@ 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 && - (strcmp(info->backing_filename, - info->full_backing_filename) != 0)) { + if (!info->has_full_backing_filename) { + func_fprintf(f, " (cannot determine actual path)"); + } else if (strcmp(info->backing_filename, + info->full_backing_filename) != 0) { func_fprintf(f, " (actual path: %s)", info->full_backing_filename); } func_fprintf(f, "\n");