cryptospore / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
218e99
From bb21b453413a2f98069fef482761982d1e90234a Mon Sep 17 00:00:00 2001
218e99
From: Max Reitz <mreitz@redhat.com>
218e99
Date: Mon, 4 Nov 2013 22:32:13 +0100
218e99
Subject: [PATCH 20/87] qemu-img create: Emit filename on error
218e99
218e99
RH-Author: Max Reitz <mreitz@redhat.com>
218e99
Message-id: <1383604354-12743-23-git-send-email-mreitz@redhat.com>
218e99
Patchwork-id: 55322
218e99
O-Subject: [RHEL-7.0 qemu-kvm PATCH 22/43] qemu-img create: Emit filename on error
218e99
Bugzilla: 1026524
218e99
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
218e99
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
218e99
RH-Acked-by: Fam Zheng <famz@redhat.com>
218e99
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
218e99
218e99
BZ: 1026524
218e99
218e99
bdrv_img_create generally does not emit the target filename, although
218e99
this is pretty important information. Therefore, prepend its error
218e99
message with the output filename (if an error occurs).
218e99
218e99
Signed-off-by: Max Reitz <mreitz@redhat.com>
218e99
(cherry picked from commit b70d8c237a0e5e829474c3a12c8783893c4e470e)
218e99
218e99
Signed-off-by: Max Reitz <mreitz@redhat.com>
218e99
---
218e99
 qemu-img.c | 2 +-
218e99
 1 file changed, 1 insertion(+), 1 deletion(-)
218e99
218e99
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
218e99
---
218e99
 qemu-img.c |    2 +-
218e99
 1 files changed, 1 insertions(+), 1 deletions(-)
218e99
218e99
diff --git a/qemu-img.c b/qemu-img.c
218e99
index 9fda8cf..0f869f3 100644
218e99
--- a/qemu-img.c
218e99
+++ b/qemu-img.c
218e99
@@ -409,7 +409,7 @@ static int img_create(int argc, char **argv)
218e99
     bdrv_img_create(filename, fmt, base_filename, base_fmt,
218e99
                     options, img_size, BDRV_O_FLAGS, &local_err, quiet);
218e99
     if (error_is_set(&local_err)) {
218e99
-        error_report("%s", error_get_pretty(local_err));
218e99
+        error_report("%s: %s", filename, error_get_pretty(local_err));
218e99
         error_free(local_err);
218e99
         return 1;
218e99
     }
218e99
-- 
218e99
1.7.1
218e99