[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 4/7] block/raw-win32: Always use -errno in hdev_open
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 4/7] block/raw-win32: Always use -errno in hdev_open |
Date: |
Fri, 18 Oct 2013 16:18:32 +0200 |
From: Max Reitz <address@hidden>
On one occasion, hdev_open() returned -1 in case of an unknown error
instead of a proper -errno value. Adjust this to match the behavior of
raw_open() (in raw-win32), which is to return -EINVAL in this case.
Also, change the call to error_setg*() to match the one in raw_open() as
well.
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
block/raw-win32.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/block/raw-win32.c b/block/raw-win32.c
index c3e4c62..676b570 100644
--- a/block/raw-win32.c
+++ b/block/raw-win32.c
@@ -590,12 +590,11 @@ static int hdev_open(BlockDriverState *bs, QDict
*options, int flags,
int err = GetLastError();
if (err == ERROR_ACCESS_DENIED) {
- error_setg_errno(errp, EACCES, "Could not open device");
ret = -EACCES;
} else {
- error_setg(errp, "Could not open device");
- ret = -1;
+ ret = -EINVAL;
}
+ error_setg_errno(errp, -ret, "Could not open device");
goto done;
}
--
1.8.3.1
- [Qemu-devel] [PULL 0/7] Block patches, Stefan Hajnoczi, 2013/10/18
- [Qemu-devel] [PULL 2/7] sd: Avoid access to NULL BlockDriverState, Stefan Hajnoczi, 2013/10/18
- [Qemu-devel] [PULL 1/7] hmp: drop bogus "[not inserted]", Stefan Hajnoczi, 2013/10/18
- [Qemu-devel] [PULL 5/7] virtio: Remove unneeded memcpy, Stefan Hajnoczi, 2013/10/18
- [Qemu-devel] [PULL 3/7] blockdev: fix cdrom read_only flag, Stefan Hajnoczi, 2013/10/18
- [Qemu-devel] [PULL 4/7] block/raw-win32: Always use -errno in hdev_open,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL 6/7] vmdk: Only read cid from image file when opening, Stefan Hajnoczi, 2013/10/18
- [Qemu-devel] [PULL 7/7] vmdk: fix VMFS extent parsing, Stefan Hajnoczi, 2013/10/18