Commit f6fc1e30 authored Jul 25, 2019 by Paolo Bonzini Committed by Thomas Huth Aug 17, 2019

block: fix NetBSD qemu-iotests failure

Opening a block device on NetBSD has an additional step compared to other OSes,
corresponding to raw_normalize_devicepath. The error message in that function
is slightly different from that in raw_open_common and this was causing spurious
failures in qemu-iotests. However, in general it is not important to know what
exact step was failing, for example in the qemu-iotests case the error message
contains the fairly unequivocal "No such file or directory" text from strerror.
We can thus fix the failures by standardizing on a single error message for
both raw_open_common and raw_normalize_devicepath; in fact, we can even
use error_setg_file_open to make sure the error message is the same as in
the rest of QEMU.

Message-Id: <20190725095920.28419-1-pbonzini@redhat.com>
Tested-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>

parent afd76053

block/file-posix.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -217,7 +217,7 @@ static int raw_normalize_devicepath(const char filename, Error errp)
		fname = *filename;
		dp = strrchr(fname, '/');
		if (lstat(fname, &sb) < 0) {
		error_setg_errno(errp, errno, "%s: stat failed", fname);
		error_setg_file_open(errp, errno, fname);
		return -errno;
		}

		@@ -561,7 +561,7 @@ static int raw_open_common(BlockDriverState bs, QDict options,
		ret = fd < 0 ? -errno : 0;

		if (ret < 0) {
		error_setg_errno(errp, -ret, "Could not open '%s'", filename);
		error_setg_file_open(errp, -ret, filename);
		if (ret == -EROFS) {
		ret = -EACCES;
		}