|
 |
9ae3a8 |
From bde3157fa573b77a573a248ed27a7ad6974a329e Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: Jeffrey Cody <jcody@redhat.com>
|
|
|
9ae3a8 |
Date: Thu, 23 Jan 2014 21:02:38 +0100
|
|
|
9ae3a8 |
Subject: [PATCH 14/14] block: use correct filename for error report
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
RH-Author: Jeffrey Cody <jcody@redhat.com>
|
|
|
9ae3a8 |
Message-id: <8724e61ff2600d6daa9a50e4e920e35e658d252b.1390510896.git.jcody@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 56934
|
|
|
9ae3a8 |
O-Subject: [RHEL7 qemu-kvm PATCH] block: use correct filename for error report
|
|
|
9ae3a8 |
Bugzilla: 1051438
|
|
|
9ae3a8 |
RH-Acked-by: Fam Zheng <famz@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Markus Armbruster <armbru@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
From: Dunrong Huang <riegamaths@gmail.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
The content filename point to will be erased by qemu_opts_absorb_qdict()
|
|
|
9ae3a8 |
in raw_open_common() in drv->bdrv_file_open()
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
So it's better to use bs->filename.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Dunrong Huang <riegamaths@gmail.com>
|
|
|
9ae3a8 |
Reviewed-by: Max Reitz <mreitz@redhat.com>
|
|
|
9ae3a8 |
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
9ae3a8 |
(cherry picked from commit 2fa9aa59cfc472c16309c4e84547aa873423b2f5)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
RHEL7 Notes:
|
|
|
9ae3a8 |
BZ: 1051438
|
|
|
9ae3a8 |
Brew: http://brewweb.devel.redhat.com/brew/taskinfo?taskID=6926450
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Jeff Cody <jcody@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
block.c | 4 ++--
|
|
|
9ae3a8 |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
block.c | 4 ++--
|
|
|
9ae3a8 |
1 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/block.c b/block.c
|
|
|
9ae3a8 |
index 3232971..1433844 100644
|
|
|
9ae3a8 |
--- a/block.c
|
|
|
9ae3a8 |
+++ b/block.c
|
|
|
9ae3a8 |
@@ -783,8 +783,8 @@ static int bdrv_open_common(BlockDriverState *bs, BlockDriverState *file,
|
|
|
9ae3a8 |
if (ret < 0) {
|
|
|
9ae3a8 |
if (error_is_set(&local_err)) {
|
|
|
9ae3a8 |
error_propagate(errp, local_err);
|
|
|
9ae3a8 |
- } else if (filename) {
|
|
|
9ae3a8 |
- error_setg_errno(errp, -ret, "Could not open '%s'", filename);
|
|
|
9ae3a8 |
+ } else if (bs->filename[0]) {
|
|
|
9ae3a8 |
+ error_setg_errno(errp, -ret, "Could not open '%s'", bs->filename);
|
|
|
9ae3a8 |
} else {
|
|
|
9ae3a8 |
error_setg_errno(errp, -ret, "Could not open image");
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.7.1
|
|
|
9ae3a8 |
|