OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

char: use error_report()

Browse Source 
Prefer error_report() over fprintf(stderr..)

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Marc-André Lureau 2016-11-30 22:57:24 +04:00 committed by Paolo Bonzini
parent 096b4894e5
commit 776a32a075
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
qemu-char.c
View File

@ -451,8 +451,8 @@ int qemu_chr_fe_get_msgfd(CharBackend *be)
int fd; int fd;
int res = (qemu_chr_fe_get_msgfds(be, &fd, 1) == 1) ? fd : -1; int res = (qemu_chr_fe_get_msgfds(be, &fd, 1) == 1) ? fd : -1;
if (s && qemu_chr_replay(s)) { if (s && qemu_chr_replay(s)) {
fprintf(stderr, error_report("Replay: get msgfd is not supported "
"Replay: get msgfd is not supported for serial devices yet\n"); "for serial devices yet");
exit(1); exit(1);
} }
return res; return res;
@ -1680,7 +1680,7 @@ static Chardev *qemu_chr_open_pty(const CharDriver *driver,
ret->pty = g_strdup(pty_name); ret->pty = g_strdup(pty_name);
ret->has_pty = true; ret->has_pty = true;
fprintf(stderr, "char device redirected to %s (label %s)\n", error_report("char device redirected to %s (label %s)",
pty_name, id); pty_name, id);
s = (PtyChardev *)chr; s = (PtyChardev *)chr;
@ -3383,7 +3383,7 @@ static int tcp_chr_wait_connected(Chardev *chr, Error **errp)
* in TLS and telnet cases, only wait for an accepted socket */ * in TLS and telnet cases, only wait for an accepted socket */
while (!s->ioc) { while (!s->ioc) {
if (s->is_listen) { if (s->is_listen) {
fprintf(stderr, "QEMU waiting for connection on: %s\n", error_report("QEMU waiting for connection on: %s",
chr->filename); chr->filename);
qio_channel_set_blocking(QIO_CHANNEL(s->listen_ioc), true, NULL); qio_channel_set_blocking(QIO_CHANNEL(s->listen_ioc), true, NULL);
tcp_chr_accept(QIO_CHANNEL(s->listen_ioc), G_IO_IN, chr); tcp_chr_accept(QIO_CHANNEL(s->listen_ioc), G_IO_IN, chr);
@ -4146,16 +4146,19 @@ Chardev *qemu_chr_new_from_opts(QemuOpts *opts,
} }
if (is_help_option(name)) { if (is_help_option(name)) {
fprintf(stderr, "Available chardev backend types:\n"); GString *str = g_string_new("");
for (i = 0; i < ARRAY_SIZE(backends); i++) { for (i = 0; i < ARRAY_SIZE(backends); i++) {
cd = backends[i]; cd = backends[i];
if (cd) { if (cd) {
fprintf(stderr, "%s\n", ChardevBackendKind_lookup[cd->kind]); g_string_append_printf(str, "\n%s", ChardevBackendKind_lookup[cd->kind]);
if (cd->alias) { if (cd->alias) {
fprintf(stderr, "%s\n", cd->alias); g_string_append_printf(str, "\n%s", cd->alias);
} }
} }
} }
error_report("Available chardev backend types: %s", str->str);
g_string_free(str, true);
exit(0); exit(0);
} }
@ -4267,8 +4270,8 @@ Chardev *qemu_chr_new(const char *label, const char *filename)
qemu_chr_set_feature(chr, QEMU_CHAR_FEATURE_REPLAY); qemu_chr_set_feature(chr, QEMU_CHAR_FEATURE_REPLAY);
} }
if (qemu_chr_replay(chr) && chr->driver->chr_ioctl) { if (qemu_chr_replay(chr) && chr->driver->chr_ioctl) {
fprintf(stderr, error_report("Replay: ioctl is not supported "
"Replay: ioctl is not supported for serial devices yet\n"); "for serial devices yet");
} }
replay_register_char_driver(chr); replay_register_char_driver(chr);
} }