[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 11/16] qga: replace qemu_open_old() with qemu_open_cloexec()
From: |
marcandre . lureau |
Subject: |
[PATCH 11/16] qga: replace qemu_open_old() with qemu_open_cloexec() |
Date: |
Wed, 4 May 2022 21:30:20 +0400 |
From: Marc-André Lureau <marcandre.lureau@redhat.com>
qemu_open_old() uses qemu_open_internal() which handles special
"/dev/fdset/" path for monitor fd sets, set CLOEXEC, and uses Error
reporting (and some O_DIRECT special error casing).
The monitor fdset handling is unnecessary for qga, use
qemu_open_cloexec() instead.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
qga/channel-posix.c | 18 ++++++++++++------
qga/commands-posix.c | 23 +++++++++++------------
2 files changed, 23 insertions(+), 18 deletions(-)
diff --git a/qga/channel-posix.c b/qga/channel-posix.c
index a996858e2492..7752114e214d 100644
--- a/qga/channel-posix.c
+++ b/qga/channel-posix.c
@@ -1,4 +1,5 @@
#include "qemu/osdep.h"
+#include "qemu/cutils.h"
#include <termios.h>
#include "qapi/error.h"
#include "qemu/sockets.h"
@@ -121,19 +122,24 @@ static int ga_channel_client_add(GAChannel *c, int fd)
static gboolean ga_channel_open(GAChannel *c, const gchar *path,
GAChannelMethod method, int fd)
{
+ g_autoptr(Error) err = NULL;
int ret;
c->method = method;
switch (c->method) {
case GA_CHANNEL_VIRTIO_SERIAL: {
assert(fd < 0);
- fd = qemu_open_old(path, O_RDWR | O_NONBLOCK
+ fd = qemu_open_cloexec(
+ path,
#ifndef CONFIG_SOLARIS
- | O_ASYNC
+ O_ASYNC |
#endif
- );
+ O_RDWR | O_NONBLOCK,
+ 0,
+ &err
+ );
if (fd == -1) {
- g_critical("error opening channel: %s", strerror(errno));
+ g_critical("error opening channel: %s", error_get_pretty(err));
return false;
}
#ifdef CONFIG_SOLARIS
@@ -157,9 +163,9 @@ static gboolean ga_channel_open(GAChannel *c, const gchar
*path,
struct termios tio;
assert(fd < 0);
- fd = qemu_open_old(path, O_RDWR | O_NOCTTY | O_NONBLOCK);
+ fd = qemu_open_cloexec(path, O_RDWR | O_NOCTTY | O_NONBLOCK, 0, &err);
if (fd == -1) {
- g_critical("error opening channel: %s", strerror(errno));
+ g_critical("error opening channel: %s", error_get_pretty(err));
return false;
}
tcgetattr(fd, &tio);
diff --git a/qga/commands-posix.c b/qga/commands-posix.c
index 974bcbee7e97..70036b789e6f 100644
--- a/qga/commands-posix.c
+++ b/qga/commands-posix.c
@@ -1394,6 +1394,7 @@ static GuestDiskInfoList *get_disk_partitions(
static void get_nvme_smart(GuestDiskInfo *disk)
{
+ g_autoptr(Error) err = NULL;
int fd;
GuestNVMeSmart *smart;
NvmeSmartLog log = {0};
@@ -1406,9 +1407,9 @@ static void get_nvme_smart(GuestDiskInfo *disk)
| (((sizeof(log) >> 2) - 1) << 16)
};
- fd = qemu_open_old(disk->name, O_RDONLY);
+ fd = qemu_open_cloexec(disk->name, O_RDONLY, 0, &err);
if (fd == -1) {
- g_debug("Failed to open device: %s: %s", disk->name,
g_strerror(errno));
+ g_debug("Failed to open device: %s: %s", disk->name,
error_get_pretty(err));
return;
}
@@ -1739,9 +1740,8 @@ int64_t qmp_guest_fsfreeze_freeze_list(bool
has_mountpoints,
}
}
- fd = qemu_open_old(mount->dirname, O_RDONLY);
+ fd = qemu_open_cloexec(mount->dirname, O_RDONLY, 0, errp);
if (fd == -1) {
- error_setg_errno(errp, errno, "failed to open %s", mount->dirname);
goto error;
}
@@ -1806,7 +1806,7 @@ int64_t qmp_guest_fsfreeze_thaw(Error **errp)
QTAILQ_FOREACH(mount, &mounts, next) {
logged = false;
- fd = qemu_open_old(mount->dirname, O_RDONLY);
+ fd = qemu_open_cloexec(mount->dirname, O_RDONLY, 0, NULL);
if (fd == -1) {
continue;
}
@@ -1866,21 +1866,20 @@ static void guest_fsfreeze_cleanup(void)
GuestFilesystemTrimResponse *
qmp_guest_fstrim(bool has_minimum, int64_t minimum, Error **errp)
{
+ ERRP_GUARD();
GuestFilesystemTrimResponse *response;
GuestFilesystemTrimResult *result;
int ret = 0;
FsMountList mounts;
struct FsMount *mount;
int fd;
- Error *local_err = NULL;
struct fstrim_range r;
slog("guest-fstrim called");
QTAILQ_INIT(&mounts);
- build_fs_mount_list(&mounts, &local_err);
- if (local_err) {
- error_propagate(errp, local_err);
+ build_fs_mount_list(&mounts, errp);
+ if (*errp) {
return NULL;
}
@@ -1892,11 +1891,11 @@ qmp_guest_fstrim(bool has_minimum, int64_t minimum,
Error **errp)
QAPI_LIST_PREPEND(response->paths, result);
- fd = qemu_open_old(mount->dirname, O_RDONLY);
+ fd = qemu_open_cloexec(mount->dirname, O_RDONLY, 0, errp);
if (fd == -1) {
- result->error = g_strdup_printf("failed to open: %s",
- strerror(errno));
+ result->error = g_strdup(error_get_pretty(*errp));
result->has_error = true;
+ g_clear_pointer(errp, error_free);
continue;
}
--
2.36.0.44.g0f828332d5ac
- Re: [PATCH 04/16] compiler.h: add QEMU_{BEGIN, END}_IGNORE_INITIALIZER_OVERRIDES, (continued)
- [PATCH 05/16] qobject/json-lexer: disable -Winitializer-overrides warnings, marcandre . lureau, 2022/05/04
- [PATCH 06/16] include: adjust header guards after renaming, marcandre . lureau, 2022/05/04
- [PATCH 08/16] osdep: export qemu_open_cloexec(), marcandre . lureau, 2022/05/04
- [PATCH 07/16] qga: flatten safe_open_or_create(), marcandre . lureau, 2022/05/04
- [PATCH 09/16] qga: use qemu_open_cloexec() for safe_open_or_create(), marcandre . lureau, 2022/05/04
- [PATCH 10/16] qapi/error: add g_autoptr(Error) support, marcandre . lureau, 2022/05/04
- [PATCH 11/16] qga: replace qemu_open_old() with qemu_open_cloexec(),
marcandre . lureau <=
- [PATCH 12/16] test/qga: use G_TEST_DIR to locate os-release test file, marcandre . lureau, 2022/05/04
- [PATCH 13/16] qga/wixl: prefer variables over environment, marcandre . lureau, 2022/05/04
- [PATCH 14/16] qga/wixl: require Mingw_bin, marcandre . lureau, 2022/05/04
- [PATCH 15/16] qga/wixl: simplify some pre-processing, marcandre . lureau, 2022/05/04
- [PATCH 16/16] qga/wixl: replace QEMU_GA_MSI_MINGW_BIN_PATH with glib bindir, marcandre . lureau, 2022/05/04
- Re: [PATCH 00/16] Misc cleanups, Paolo Bonzini, 2022/05/05