[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 7/8] util: give a specific error message when O_DIRECT doesn't
From: |
Daniel P . Berrangé |
Subject: |
[PATCH v5 7/8] util: give a specific error message when O_DIRECT doesn't work |
Date: |
Wed, 2 Sep 2020 18:09:12 +0100 |
A common error scenario is to tell QEMU to use O_DIRECT in combination
with a filesystem that doesn't support it. To aid users to diagnosing
their mistake we want to provide a clear error message when this happens.
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
util/osdep.c | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/util/osdep.c b/util/osdep.c
index c99f1e7db2..8ea7a807c1 100644
--- a/util/osdep.c
+++ b/util/osdep.c
@@ -332,11 +332,24 @@ qemu_open_internal(const char *name, int flags, mode_t
mode, Error **errp)
if (ret == -1) {
const char *action = flags & O_CREAT ? "create" : "open";
+#ifdef O_DIRECT
+ /* Give more helpful error message for O_DIRECT */
+ if (errno == EINVAL && (flags & O_DIRECT)) {
+ ret = open(name, flags & ~O_DIRECT, mode);
+ if (ret != -1) {
+ close(ret);
+ error_setg(errp, "Could not %s '%s': "
+ "filesystem does not support O_DIRECT",
+ action, name);
+ errno = EINVAL; /* restore first open()'s errno */
+ return -1;
+ }
+ }
+#endif /* O_DIRECT */
error_setg_errno(errp, errno, "Could not %s '%s'",
action, name);
}
-
return ret;
}
--
2.26.2
- [PATCH v5 2/8] util: split off a helper for dealing with O_CLOEXEC flag, (continued)
- [PATCH v5 2/8] util: split off a helper for dealing with O_CLOEXEC flag, Daniel P . Berrangé, 2020/09/02
- [PATCH v5 3/8] util: rename qemu_open() to qemu_open_old(), Daniel P . Berrangé, 2020/09/02
- [PATCH v5 4/8] util: refactor qemu_open_old to split off variadic args handling, Daniel P . Berrangé, 2020/09/02
- [PATCH v5 5/8] util: add Error object for qemu_open_internal error reporting, Daniel P . Berrangé, 2020/09/02
- [PATCH v5 6/8] util: introduce qemu_open and qemu_create with error reporting, Daniel P . Berrangé, 2020/09/02
- [PATCH v5 7/8] util: give a specific error message when O_DIRECT doesn't work,
Daniel P . Berrangé <=
- [PATCH v5 8/8] block/file: switch to use qemu_open/qemu_create for improved errors, Daniel P . Berrangé, 2020/09/02