mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-09-06 18:05:37 +00:00
qga: replace qemu_open_old() with qga_open_cloexec()
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 qga_open_cloexec() instead. Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Reviewed-by: Konstantin Kostiuk <kkostiuk@redhat.com> Message-Id: <20220525144140.591926-9-marcandre.lureau@redhat.com>
This commit is contained in:
parent
87ed8b2c2c
commit
b9947c9ce7
|
@ -1,8 +1,10 @@
|
||||||
#include "qemu/osdep.h"
|
#include "qemu/osdep.h"
|
||||||
|
#include "qemu/cutils.h"
|
||||||
#include <termios.h>
|
#include <termios.h>
|
||||||
#include "qapi/error.h"
|
#include "qapi/error.h"
|
||||||
#include "qemu/sockets.h"
|
#include "qemu/sockets.h"
|
||||||
#include "channel.h"
|
#include "channel.h"
|
||||||
|
#include "cutils.h"
|
||||||
|
|
||||||
#ifdef CONFIG_SOLARIS
|
#ifdef CONFIG_SOLARIS
|
||||||
#include <stropts.h>
|
#include <stropts.h>
|
||||||
|
@ -127,11 +129,14 @@ static gboolean ga_channel_open(GAChannel *c, const gchar *path,
|
||||||
switch (c->method) {
|
switch (c->method) {
|
||||||
case GA_CHANNEL_VIRTIO_SERIAL: {
|
case GA_CHANNEL_VIRTIO_SERIAL: {
|
||||||
assert(fd < 0);
|
assert(fd < 0);
|
||||||
fd = qemu_open_old(path, O_RDWR | O_NONBLOCK
|
fd = qga_open_cloexec(
|
||||||
|
path,
|
||||||
#ifndef CONFIG_SOLARIS
|
#ifndef CONFIG_SOLARIS
|
||||||
| O_ASYNC
|
O_ASYNC |
|
||||||
#endif
|
#endif
|
||||||
);
|
O_RDWR | O_NONBLOCK,
|
||||||
|
0
|
||||||
|
);
|
||||||
if (fd == -1) {
|
if (fd == -1) {
|
||||||
error_setg_errno(errp, errno, "error opening channel");
|
error_setg_errno(errp, errno, "error opening channel");
|
||||||
return false;
|
return false;
|
||||||
|
@ -156,7 +161,7 @@ static gboolean ga_channel_open(GAChannel *c, const gchar *path,
|
||||||
struct termios tio;
|
struct termios tio;
|
||||||
|
|
||||||
assert(fd < 0);
|
assert(fd < 0);
|
||||||
fd = qemu_open_old(path, O_RDWR | O_NOCTTY | O_NONBLOCK);
|
fd = qga_open_cloexec(path, O_RDWR | O_NOCTTY | O_NONBLOCK, 0);
|
||||||
if (fd == -1) {
|
if (fd == -1) {
|
||||||
error_setg_errno(errp, errno, "error opening channel");
|
error_setg_errno(errp, errno, "error opening channel");
|
||||||
return false;
|
return false;
|
||||||
|
|
|
@ -1406,7 +1406,7 @@ static void get_nvme_smart(GuestDiskInfo *disk)
|
||||||
| (((sizeof(log) >> 2) - 1) << 16)
|
| (((sizeof(log) >> 2) - 1) << 16)
|
||||||
};
|
};
|
||||||
|
|
||||||
fd = qemu_open_old(disk->name, O_RDONLY);
|
fd = qga_open_cloexec(disk->name, O_RDONLY, 0);
|
||||||
if (fd == -1) {
|
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, g_strerror(errno));
|
||||||
return;
|
return;
|
||||||
|
@ -1739,7 +1739,7 @@ int64_t qmp_guest_fsfreeze_freeze_list(bool has_mountpoints,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fd = qemu_open_old(mount->dirname, O_RDONLY);
|
fd = qga_open_cloexec(mount->dirname, O_RDONLY, 0);
|
||||||
if (fd == -1) {
|
if (fd == -1) {
|
||||||
error_setg_errno(errp, errno, "failed to open %s", mount->dirname);
|
error_setg_errno(errp, errno, "failed to open %s", mount->dirname);
|
||||||
goto error;
|
goto error;
|
||||||
|
@ -1806,7 +1806,7 @@ int64_t qmp_guest_fsfreeze_thaw(Error **errp)
|
||||||
|
|
||||||
QTAILQ_FOREACH(mount, &mounts, next) {
|
QTAILQ_FOREACH(mount, &mounts, next) {
|
||||||
logged = false;
|
logged = false;
|
||||||
fd = qemu_open_old(mount->dirname, O_RDONLY);
|
fd = qga_open_cloexec(mount->dirname, O_RDONLY, 0);
|
||||||
if (fd == -1) {
|
if (fd == -1) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
@ -1892,7 +1892,7 @@ qmp_guest_fstrim(bool has_minimum, int64_t minimum, Error **errp)
|
||||||
|
|
||||||
QAPI_LIST_PREPEND(response->paths, result);
|
QAPI_LIST_PREPEND(response->paths, result);
|
||||||
|
|
||||||
fd = qemu_open_old(mount->dirname, O_RDONLY);
|
fd = qga_open_cloexec(mount->dirname, O_RDONLY, 0);
|
||||||
if (fd == -1) {
|
if (fd == -1) {
|
||||||
result->error = g_strdup_printf("failed to open: %s",
|
result->error = g_strdup_printf("failed to open: %s",
|
||||||
strerror(errno));
|
strerror(errno));
|
||||||
|
|
Loading…
Reference in a new issue