[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v3 3/5] block/qapi: explicitly warn if !has_full_bac
From: |
John Snow |
Subject: |
[Qemu-block] [PATCH v3 3/5] block/qapi: explicitly warn if !has_full_backing_filename |
Date: |
Mon, 14 Dec 2015 14:55:14 -0500 |
Disambiguate "Backing filename and full backing filename" are equivalent
from "full backing filename could not be determined."
Signed-off-by: John Snow <address@hidden>
---
block/qapi.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/block/qapi.c b/block/qapi.c
index 0e6b333..c61fb30 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");
--
2.4.3
- [Qemu-block] [PATCH v3 0/5] block: allow partial info-block query, John Snow, 2015/12/14
- [Qemu-block] [PATCH v3 1/5] block/qapi: do not redundantly print "actual path", John Snow, 2015/12/14
- [Qemu-block] [PATCH v3 3/5] block/qapi: explicitly warn if !has_full_backing_filename,
John Snow <=
- [Qemu-block] [PATCH v3 5/5] block/qapi: allow best-effort query, John Snow, 2015/12/14
- [Qemu-block] [PATCH v3 2/5] block/qapi: always report full_backing_filename, John Snow, 2015/12/14
- [Qemu-block] [PATCH v3 4/5] qemu-img: abort when full_backing_filename not present, John Snow, 2015/12/14
- Re: [Qemu-block] [PATCH v3 0/5] block: allow partial info-block query, Max Reitz, 2015/12/14