diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-08-19 14:14:09 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-08-19 14:14:09 +0100 |
| commit | 3fbd3405d2b0604ea530fc7a1828f19da1e95ff9 (patch) | |
| tree | 408f8dced94b28808b91fbbad5efb87363129c7a /block | |
| parent | 9f3a972e225600d76c673ed23da2bcb07f27aa4d (diff) | |
| parent | 72e031f3b80a421b309ce0d1759b26e428f944db (diff) | |
Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2019-08-17' into staging
- Run the iotest during "make check"
# gpg: Signature made Sat 17 Aug 2019 09:46:13 BST
# gpg: using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5
# gpg: issuer "thuth@redhat.com"
# gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [full]
# gpg: aka "Thomas Huth <thuth@redhat.com>" [full]
# gpg: aka "Thomas Huth <huth@tuxfamily.org>" [full]
# gpg: aka "Thomas Huth <th.huth@posteo.de>" [unknown]
# Primary key fingerprint: 27B8 8847 EEE0 2501 18F3 EAB9 2ED9 D774 FE70 2DB5
* remotes/huth-gitlab/tags/pull-request-2019-08-17:
gitlab-ci: Remove qcow2 tests that are handled by "make check" already
tests: Run the iotests during "make check" again
block: fix NetBSD qemu-iotests failure
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'block')
| -rw-r--r-- | block/file-posix.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/block/file-posix.c b/block/file-posix.c index b8b4dad553..e41e91e075 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -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; } |