[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 05/15] osdep: export qemu_open_cloexec()
From: |
marcandre . lureau |
Subject: |
[PATCH v3 05/15] osdep: export qemu_open_cloexec() |
Date: |
Fri, 13 May 2022 20:08:11 +0200 |
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Used in the next patch, to simplify qga code.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
include/qemu/osdep.h | 1 +
util/osdep.c | 10 ++++++++--
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h
index 67cc465416..64f51cfb7a 100644
--- a/include/qemu/osdep.h
+++ b/include/qemu/osdep.h
@@ -489,6 +489,7 @@ void sigaction_invoke(struct sigaction *action,
*/
int qemu_open_old(const char *name, int flags, ...);
int qemu_open(const char *name, int flags, Error **errp);
+int qemu_open_cloexec(const char *name, int flags, mode_t mode, Error **errp);
int qemu_create(const char *name, int flags, mode_t mode, Error **errp);
int qemu_close(int fd);
int qemu_unlink(const char *name);
diff --git a/util/osdep.c b/util/osdep.c
index 60fcbbaebe..545a88e1fd 100644
--- a/util/osdep.c
+++ b/util/osdep.c
@@ -279,9 +279,11 @@ int qemu_lock_fd_test(int fd, int64_t start, int64_t len,
bool exclusive)
}
#endif
-static int qemu_open_cloexec(const char *name, int flags, mode_t mode)
+int qemu_open_cloexec(const char *name, int flags, mode_t mode, Error **errp)
{
+ ERRP_GUARD();
int ret;
+
#ifdef O_CLOEXEC
ret = open(name, flags | O_CLOEXEC, mode);
#else
@@ -290,6 +292,10 @@ static int qemu_open_cloexec(const char *name, int flags,
mode_t mode)
qemu_set_cloexec(ret);
}
#endif
+ if (ret == -1) {
+ error_setg_errno(errp, errno, "Failed to open file '%s'", name);
+ }
+
return ret;
}
@@ -327,7 +333,7 @@ qemu_open_internal(const char *name, int flags, mode_t
mode, Error **errp)
}
#endif
- ret = qemu_open_cloexec(name, flags, mode);
+ ret = qemu_open_cloexec(name, flags, mode, NULL);
if (ret == -1) {
const char *action = flags & O_CREAT ? "create" : "open";
--
2.36.1
- [PATCH v3 00/15] Misc cleanups, marcandre . lureau, 2022/05/13
- [PATCH v3 01/15] include: move qemu_*_exec_dir() to cutils, marcandre . lureau, 2022/05/13
- [PATCH v3 02/15] util/win32: simplify qemu_get_local_state_dir(), marcandre . lureau, 2022/05/13
- [PATCH v3 03/15] tests: make libqmp buildable for win32, marcandre . lureau, 2022/05/13
- [PATCH v3 05/15] osdep: export qemu_open_cloexec(),
marcandre . lureau <=
- Re: [PATCH v3 05/15] osdep: export qemu_open_cloexec(), Markus Armbruster, 2022/05/23
- Re: [PATCH v3 05/15] osdep: export qemu_open_cloexec(), Peter Maydell, 2022/05/23
- Re: [PATCH v3 05/15] osdep: export qemu_open_cloexec(), Daniel P . Berrangé, 2022/05/23
- Re: [PATCH v3 05/15] osdep: export qemu_open_cloexec(), Marc-André Lureau, 2022/05/23
- Re: [PATCH v3 05/15] osdep: export qemu_open_cloexec(), Daniel P . Berrangé, 2022/05/23
- Re: [PATCH v3 05/15] osdep: export qemu_open_cloexec(), Marc-André Lureau, 2022/05/23
- Re: [PATCH v3 05/15] osdep: export qemu_open_cloexec(), Daniel P . Berrangé, 2022/05/23
- Re: [PATCH v3 05/15] osdep: export qemu_open_cloexec(), Marc-André Lureau, 2022/05/23
[PATCH v3 04/15] qga: flatten safe_open_or_create(), marcandre . lureau, 2022/05/13