From: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Every caller already support errp, let's go further.
Suggested-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
chardev/char-fd.c | 12 ++++++++----
chardev/char-file.c | 6 +++++-
chardev/char-pipe.c | 9 ++++++++-
chardev/char-serial.c | 5 ++++-
chardev/char-stdio.c | 7 +++++--
include/chardev/char-fd.h | 2 +-
6 files changed, 31 insertions(+), 10 deletions(-)
diff --git a/chardev/char-fd.c b/chardev/char-fd.c
index 739dc68c36..4ee286f323 100644
--- a/chardev/char-fd.c
+++ b/chardev/char-fd.c
@@ -206,14 +206,16 @@ int qmp_chardev_open_file_source(char *src, int flags, Error **errp)
}
/* open a character device to a unix fd */
-void qemu_chr_open_fd(Chardev *chr,
- int fd_in, int fd_out)
+bool qemu_chr_open_fd(Chardev *chr,
+ int fd_in, int fd_out, Error **errp)
{
FDChardev *s = FD_CHARDEV(chr);
g_autofree char *name = NULL;
if (fd_out >= 0) {
- qemu_set_blocking(fd_out, false, &error_abort);
+ if (!qemu_set_blocking(fd_out, false, errp)) {
+ return false;
+ }
}
if (fd_out == fd_in && fd_in >= 0) {
@@ -221,7 +223,7 @@ void qemu_chr_open_fd(Chardev *chr,
name = g_strdup_printf("chardev-file-%s", chr->label);
qio_channel_set_name(QIO_CHANNEL(s->ioc_in), name);
s->ioc_out = QIO_CHANNEL(object_ref(s->ioc_in));
- return;
+ return true;
}
if (fd_in >= 0) {
@@ -236,6 +238,8 @@ void qemu_chr_open_fd(Chardev *chr,
name = g_strdup_printf("chardev-file-out-%s", chr->label);
qio_channel_set_name(QIO_CHANNEL(s->ioc_out), name);
}
+
+ return true;
}
static void char_fd_class_init(ObjectClass *oc, const void *data)
diff --git a/chardev/char-file.c b/chardev/char-file.c
index a9e8c5e0d7..89e9cb849c 100644
--- a/chardev/char-file.c
+++ b/chardev/char-file.c
@@ -92,7 +92,11 @@ static void qmp_chardev_open_file(Chardev *chr,
}
}
- qemu_chr_open_fd(chr, in, out);
+ if (!qemu_chr_open_fd(chr, in, out, errp)) {
+ qemu_close(out);
+ qemu_close(in);
+ return;
+ }
#endif
}
diff --git a/chardev/char-pipe.c b/chardev/char-pipe.c
index 3d1b0ce2d2..e9f3bb8290 100644
--- a/chardev/char-pipe.c
+++ b/chardev/char-pipe.c
@@ -150,7 +150,14 @@ static void qemu_chr_open_pipe(Chardev *chr,
return;
}
}
- qemu_chr_open_fd(chr, fd_in, fd_out);
+
+ if (!qemu_chr_open_fd(chr, fd_in, fd_out, errp)) {
+ close(fd_in);
+ if (fd_out != fd_in) {
+ close(fd_out);
+ }
+ return;
+ }
}
#endif /* !_WIN32 */
diff --git a/chardev/char-serial.c b/chardev/char-serial.c
index 1ff31dcde3..c622d758db 100644
--- a/chardev/char-serial.c
+++ b/chardev/char-serial.c
@@ -276,7 +276,10 @@ static void qmp_chardev_open_serial(Chardev *chr,
}
tty_serial_init(fd, 115200, 'N', 8, 1);
- qemu_chr_open_fd(chr, fd, fd);
+ if (!qemu_chr_open_fd(chr, fd, fd, errp)) {
+ close(fd);
+ return;
+ }
}
#endif /* __linux__ || __sun__ */
diff --git a/chardev/char-stdio.c b/chardev/char-stdio.c
index 193727e807..2568164a10 100644
--- a/chardev/char-stdio.c
+++ b/chardev/char-stdio.c
@@ -110,14 +110,17 @@ static void qemu_chr_open_stdio(Chardev *chr,
if (!qemu_set_blocking(0, false, errp)) {
return;
}
+
+ if (!qemu_chr_open_fd(chr, 0, 1, errp)) {
+ return;
+ }
+
atexit(term_exit);
memset(&act, 0, sizeof(act));
act.sa_handler = term_stdio_handler;
sigaction(SIGCONT, &act, NULL);
- qemu_chr_open_fd(chr, 0, 1);
-
stdio_allow_signal = !opts->has_signal || opts->signal;
qemu_chr_set_echo_stdio(chr, false);
}
diff --git a/include/chardev/char-fd.h b/include/chardev/char-fd.h
index 9de0e440de..6fe43062ca 100644
--- a/include/chardev/char-fd.h
+++ b/include/chardev/char-fd.h
@@ -41,7 +41,7 @@ typedef struct FDChardev FDChardev;
DECLARE_INSTANCE_CHECKER(FDChardev, FD_CHARDEV,
TYPE_CHARDEV_FD)
-void qemu_chr_open_fd(Chardev *chr, int fd_in, int fd_out);
+bool qemu_chr_open_fd(Chardev *chr, int fd_in, int fd_out, Error **errp);
int qmp_chardev_open_file_source(char *src, int flags, Error **errp);
#endif /* CHAR_FD_H */
--
2.50.1