Commit 09237757 authored Oct 11, 2016 by Halil Pasic Committed by Kevin Wolf Oct 24, 2016

block: improve error handling in raw_open



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 <pasic@linux.vnet.ibm.com>
Reviewed-by: Sascha Silbe <silbe@linux.vnet.ibm.com>
Tested-by: Marc Hartmayer <mhartmay@linux.vnet.ibm.com> (POSIX only)
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>

parent 0153d2f5

block/raw-posix.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -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;
		}

block/raw-win32.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -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 {