[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 3/8] block: use correct filename for error report
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 3/8] block: use correct filename for error report |
Date: |
Mon, 7 Oct 2013 13:28:04 +0200 |
From: Dunrong Huang <address@hidden>
The content filename point to will be erased by qemu_opts_absorb_qdict()
in raw_open_common() in drv->bdrv_file_open()
So it's better to use bs->filename.
Signed-off-by: Dunrong Huang <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
block.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/block.c b/block.c
index 93e113a..e2d9936 100644
--- a/block.c
+++ b/block.c
@@ -808,8 +808,8 @@ static int bdrv_open_common(BlockDriverState *bs,
BlockDriverState *file,
if (ret < 0) {
if (error_is_set(&local_err)) {
error_propagate(errp, local_err);
- } else if (filename) {
- error_setg_errno(errp, -ret, "Could not open '%s'", filename);
+ } else if (bs->filename[0]) {
+ error_setg_errno(errp, -ret, "Could not open '%s'", bs->filename);
} else {
error_setg_errno(errp, -ret, "Could not open image");
}
--
1.8.3.1
- [Qemu-devel] [PULL 0/8] Block patches, Stefan Hajnoczi, 2013/10/07
- [Qemu-devel] [PULL 1/8] qcow2: Correct endianness in overlap check, Stefan Hajnoczi, 2013/10/07
- [Qemu-devel] [PULL 2/8] qcow2: CHECK_OFLAG_COPIED is obsolete, Stefan Hajnoczi, 2013/10/07
- [Qemu-devel] [PULL 3/8] block: use correct filename for error report,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL 4/8] block: vhdx - add migration blocker, Stefan Hajnoczi, 2013/10/07
- [Qemu-devel] [PULL 6/8] qcow2: Free allocated L2 cluster on error, Stefan Hajnoczi, 2013/10/07
- [Qemu-devel] [PULL 5/8] qcow2: Switch L1 table in a single sequence, Stefan Hajnoczi, 2013/10/07
- [Qemu-devel] [PULL 7/8] qemu-iotests: Correct 026 output, Stefan Hajnoczi, 2013/10/07
- [Qemu-devel] [PULL 8/8] block: use correct filename, Stefan Hajnoczi, 2013/10/07