[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 06/15] osdep: export qemu_open_cloexec()
From: |
marcandre . lureau |
Subject: |
[PATCH v2 06/15] osdep: export qemu_open_cloexec() |
Date: |
Thu, 5 May 2022 12:14:22 +0400 |
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 67cc4654166b..64f51cfb7a62 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 60fcbbaebe72..67541b7654ef 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, "Could not open '%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.0.44.g0f828332d5ac
- Re: [PATCH v2 03/15] tests: make libqmp buildable for win32, (continued)
[PATCH v2 04/15] include: adjust header guards after renaming, marcandre . lureau, 2022/05/05
[PATCH v2 07/15] qga: use qemu_open_cloexec() for safe_open_or_create(), marcandre . lureau, 2022/05/05
[PATCH v2 05/15] qga: flatten safe_open_or_create(), marcandre . lureau, 2022/05/05
[PATCH v2 06/15] osdep: export qemu_open_cloexec(),
marcandre . lureau <=
[PATCH v2 08/15] qga: throw an Error in ga_channel_open(), marcandre . lureau, 2022/05/05
[PATCH v2 09/15] qga: replace qemu_open_old() with qemu_open_cloexec(), marcandre . lureau, 2022/05/05
[PATCH v2 10/15] test/qga: use G_TEST_DIR to locate os-release test file, marcandre . lureau, 2022/05/05
[PATCH v2 11/15] qga/wixl: prefer variables over environment, marcandre . lureau, 2022/05/05
[PATCH v2 12/15] qga/wixl: require Mingw_bin, marcandre . lureau, 2022/05/05