[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 13/54] char: use error_report()
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH 13/54] char: use error_report() |
Date: |
Tue, 13 Dec 2016 01:42:44 +0300 |
Prefer error_report() over fprintf(stderr..)
Signed-off-by: Marc-André Lureau <address@hidden>
---
qemu-char.c | 27 +++++++++++++++------------
1 file changed, 15 insertions(+), 12 deletions(-)
diff --git a/qemu-char.c b/qemu-char.c
index 9220001906..315037049b 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -451,8 +451,8 @@ int qemu_chr_fe_get_msgfd(CharBackend *be)
int fd;
int res = (qemu_chr_fe_get_msgfds(be, &fd, 1) == 1) ? fd : -1;
if (s && qemu_chr_replay(s)) {
- fprintf(stderr,
- "Replay: get msgfd is not supported for serial devices yet\n");
+ error_report("Replay: get msgfd is not supported "
+ "for serial devices yet");
exit(1);
}
return res;
@@ -1674,8 +1674,8 @@ static Chardev *qemu_chr_open_pty(const CharDriver
*driver,
ret->pty = g_strdup(pty_name);
ret->has_pty = true;
- fprintf(stderr, "char device redirected to %s (label %s)\n",
- pty_name, id);
+ error_report("char device redirected to %s (label %s)",
+ pty_name, id);
s = (PtyChardev *)chr;
s->ioc = QIO_CHANNEL(qio_channel_file_new_fd(master_fd));
@@ -3376,8 +3376,8 @@ static int tcp_chr_wait_connected(Chardev *chr, Error
**errp)
* in TLS and telnet cases, only wait for an accepted socket */
while (!s->ioc) {
if (s->is_listen) {
- fprintf(stderr, "QEMU waiting for connection on: %s\n",
- chr->filename);
+ error_report("QEMU waiting for connection on: %s",
+ chr->filename);
qio_channel_set_blocking(QIO_CHANNEL(s->listen_ioc), true, NULL);
tcp_chr_accept(QIO_CHANNEL(s->listen_ioc), G_IO_IN, chr);
qio_channel_set_blocking(QIO_CHANNEL(s->listen_ioc), false, NULL);
@@ -4130,17 +4130,20 @@ Chardev *qemu_chr_new_from_opts(QemuOpts *opts,
}
if (is_help_option(qemu_opt_get(opts, "backend"))) {
- fprintf(stderr, "Available chardev backend types:\n");
+ GString *str = g_string_new("");
for (i = 0; i < ARRAY_SIZE(backends); i++) {
cd = backends[i];
if (cd) {
- fprintf(stderr, "%s\n", ChardevBackendKind_lookup[cd->kind]);
+ g_string_append_printf(str, "\n%s",
ChardevBackendKind_lookup[cd->kind]);
if (cd->alias) {
- fprintf(stderr, "%s\n", cd->alias);
+ g_string_append_printf(str, "\n%s", cd->alias);
}
}
}
- exit(!is_help_option(qemu_opt_get(opts, "backend")));
+
+ error_report("Available chardev backend types: %s", str->str);
+ g_string_free(str, true);
+ exit(0);
}
if (id == NULL) {
@@ -4255,8 +4258,8 @@ Chardev *qemu_chr_new(const char *label, const char
*filename)
qemu_chr_set_feature(chr, QEMU_CHAR_FEATURE_REPLAY);
}
if (qemu_chr_replay(chr) && chr->driver->chr_ioctl) {
- fprintf(stderr,
- "Replay: ioctl is not supported for serial devices yet\n");
+ error_report("Replay: ioctl is not supported "
+ "for serial devices yet");
}
replay_register_char_driver(chr);
}
--
2.11.0
- [Qemu-devel] [PATCH 02/54] char: use a const CharDriver, (continued)
- [Qemu-devel] [PATCH 02/54] char: use a const CharDriver, Marc-André Lureau, 2016/12/12
- [Qemu-devel] [PATCH 03/54] char: use a static array for backends, Marc-André Lureau, 2016/12/12
- [Qemu-devel] [PATCH 05/54] char: fold single-user functions in caller, Marc-André Lureau, 2016/12/12
- [Qemu-devel] [PATCH 04/54] char: move callbacks in CharDriver, Marc-André Lureau, 2016/12/12
- [Qemu-devel] [PATCH 06/54] char: introduce generic qemu_chr_get_kind(), Marc-André Lureau, 2016/12/12
- [Qemu-devel] [PATCH 07/54] char: use a feature bit for replay, Marc-André Lureau, 2016/12/12
- [Qemu-devel] [PATCH 09/54] bt: use qemu_chr_alloc(), Marc-André Lureau, 2016/12/12
- [Qemu-devel] [PATCH 08/54] char: allocate CharDriverState as a single object, Marc-André Lureau, 2016/12/12
- [Qemu-devel] [PATCH 11/54] char: rename TCPChardev and NetChardev, Marc-André Lureau, 2016/12/12
- [Qemu-devel] [PATCH 12/54] spice-char: improve error reporting, Marc-André Lureau, 2016/12/12
- [Qemu-devel] [PATCH 13/54] char: use error_report(),
Marc-André Lureau <=
- [Qemu-devel] [PATCH 14/54] gtk: overwrite the console.c char driver, Marc-André Lureau, 2016/12/12
- [Qemu-devel] [PATCH 10/54] char: rename CharDriverState Chardev, Marc-André Lureau, 2016/12/12
- [Qemu-devel] [PATCH 17/54] baum: convert to finalize, Marc-André Lureau, 2016/12/12
- [Qemu-devel] [PATCH 16/54] spice-qemu-char: convert to finalize, Marc-André Lureau, 2016/12/12
- [Qemu-devel] [PATCH 18/54] msmouse: convert to finalize, Marc-André Lureau, 2016/12/12
- [Qemu-devel] [PATCH 19/54] mux: convert to finalize, Marc-André Lureau, 2016/12/12
- [Qemu-devel] [PATCH 20/54] char-udp: convert to finalize, Marc-André Lureau, 2016/12/12
- [Qemu-devel] [PATCH 15/54] chardev: qom-ify, Marc-André Lureau, 2016/12/12
- [Qemu-devel] [PATCH 21/54] char-socket: convert to finalize, Marc-André Lureau, 2016/12/12
- [Qemu-devel] [PATCH 22/54] char-pty: convert to finalize, Marc-André Lureau, 2016/12/12