[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 04/23] block: improve error handling in raw_open
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 04/23] block: improve error handling in raw_open |
Date: |
Mon, 24 Oct 2016 19:01:52 +0200 |
From: Halil Pasic <address@hidden>
Make raw_open for POSIX more consistent in handling errors by setting
the error object also when qemu_open fails. The error object was set
generally set in case of errors, but I guess this case was overlooked.
Do the same for win32.
Signed-off-by: Halil Pasic <address@hidden>
Reviewed-by: Sascha Silbe <address@hidden>
Tested-by: Marc Hartmayer <address@hidden> (POSIX only)
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
block/raw-posix.c | 1 +
block/raw-win32.c | 1 +
2 files changed, 2 insertions(+)
diff --git a/block/raw-posix.c b/block/raw-posix.c
index 166e9d1..f481e57 100644
--- a/block/raw-posix.c
+++ b/block/raw-posix.c
@@ -443,6 +443,7 @@ static int raw_open_common(BlockDriverState *bs, QDict
*options,
fd = qemu_open(filename, s->open_flags, 0644);
if (fd < 0) {
ret = -errno;
+ error_setg_errno(errp, errno, "Could not open '%s'", filename);
if (ret == -EROFS) {
ret = -EACCES;
}
diff --git a/block/raw-win32.c b/block/raw-win32.c
index 734bb10..800fabd 100644
--- a/block/raw-win32.c
+++ b/block/raw-win32.c
@@ -373,6 +373,7 @@ static int raw_open(BlockDriverState *bs, QDict *options,
int flags,
if (s->hfile == INVALID_HANDLE_VALUE) {
int err = GetLastError();
+ error_setg_win32(errp, err, "Could not open '%s'", filename);
if (err == ERROR_ACCESS_DENIED) {
ret = -EACCES;
} else {
--
1.8.3.1
- [Qemu-devel] [PULL 00/23] Block layer patches, Kevin Wolf, 2016/10/24
- [Qemu-devel] [PULL 04/23] block: improve error handling in raw_open,
Kevin Wolf <=
- [Qemu-devel] [PULL 01/23] block: failed qemu-img command should return non-zero exit code, Kevin Wolf, 2016/10/24
- [Qemu-devel] [PULL 05/23] qapi: fix memory leak in bdrv_image_info_specific_dump, Kevin Wolf, 2016/10/24
- [Qemu-devel] [PULL 02/23] qcow2: Support BDRV_REQ_MAY_UNMAP, Kevin Wolf, 2016/10/24
- [Qemu-devel] [PULL 09/23] iotests: Remove raciness from 162, Kevin Wolf, 2016/10/24
- [Qemu-devel] [PULL 10/23] iotests: Do not rely on unavailable domains in 162, Kevin Wolf, 2016/10/24
- [Qemu-devel] [PULL 03/23] block: Remove "options" indirection from blockdev-add, Kevin Wolf, 2016/10/24
- [Qemu-devel] [PULL 08/23] qemu-nbd: Add --fork option, Kevin Wolf, 2016/10/24
- [Qemu-devel] [PULL 13/23] block: Hide HBitmap in block dirty bitmap interface, Kevin Wolf, 2016/10/24
- [Qemu-devel] [PULL 17/23] block: Add two dirty bitmap getters, Kevin Wolf, 2016/10/24
- [Qemu-devel] [PULL 06/23] throttle: Correct access to wrong BlockBackendPublic structures, Kevin Wolf, 2016/10/24