[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 38/49] qemu-char: convert stdio backend to data-drive
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 38/49] qemu-char: convert stdio backend to data-driven creation |
Date: |
Fri, 16 Oct 2015 10:50:00 +0200 |
The backend now always returns errors via the Error* argument.
This avoids a double error message. Before:
qemu-system-x86_64: -chardev stdio,id=base: cannot use stdio with -daemonize
qemu-system-x86_64: -chardev stdio,id=base: Failed to create chardev
After:
qemu-system-x86_64: -chardev stdio,id=base: cannot use stdio with -daemonize
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
qemu-char.c | 57 +++++++++++++++++++++++++++++++++++++++------------------
1 file changed, 39 insertions(+), 18 deletions(-)
diff --git a/qemu-char.c b/qemu-char.c
index 3ccea3f..2b24a5c 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -1168,19 +1168,23 @@ static void qemu_chr_close_stdio(struct CharDriverState
*chr)
fd_chr_close(chr);
}
-static CharDriverState *qemu_chr_open_stdio(ChardevStdio *opts)
+static CharDriverState *qemu_chr_open_stdio(const char *id,
+ ChardevBackend *backend,
+ ChardevReturn *ret,
+ Error **errp)
{
+ ChardevStdio *opts = backend->stdio;
CharDriverState *chr;
struct sigaction act;
if (is_daemonized()) {
- error_report("cannot use stdio with -daemonize");
+ error_setg(errp, "cannot use stdio with -daemonize");
return NULL;
}
if (stdio_in_use) {
- error_report("cannot use stdio by multiple character devices");
- exit(1);
+ error_setg(errp, "cannot use stdio by multiple character devices");
+ return NULL;
}
stdio_in_use = true;
@@ -2341,7 +2345,10 @@ static void win_stdio_close(CharDriverState *chr)
g_free(chr);
}
-static CharDriverState *qemu_chr_open_stdio(ChardevStdio *opts)
+static CharDriverState *qemu_chr_open_stdio(const char *id,
+ ChardevBackend *backend,
+ ChardevReturn *ret,
+ Error **errp)
{
CharDriverState *chr;
WinStdioCharState *stdio;
@@ -2353,8 +2360,8 @@ static CharDriverState *qemu_chr_open_stdio(ChardevStdio
*opts)
stdio->hStdIn = GetStdHandle(STD_INPUT_HANDLE);
if (stdio->hStdIn == INVALID_HANDLE_VALUE) {
- fprintf(stderr, "cannot open stdio: invalid handle\n");
- exit(1);
+ error_setg(errp, "cannot open stdio: invalid handle");
+ return NULL;
}
is_console = GetConsoleMode(stdio->hStdIn, &dwMode) != 0;
@@ -2366,25 +2373,30 @@ static CharDriverState
*qemu_chr_open_stdio(ChardevStdio *opts)
if (is_console) {
if (qemu_add_wait_object(stdio->hStdIn,
win_stdio_wait_func, chr)) {
- fprintf(stderr, "qemu_add_wait_object: failed\n");
+ error_setg(errp, "qemu_add_wait_object: failed");
+ goto err1;
}
} else {
DWORD dwId;
stdio->hInputReadyEvent = CreateEvent(NULL, FALSE, FALSE, NULL);
stdio->hInputDoneEvent = CreateEvent(NULL, FALSE, FALSE, NULL);
- stdio->hInputThread = CreateThread(NULL, 0, win_stdio_thread,
- chr, 0, &dwId);
-
- if (stdio->hInputThread == INVALID_HANDLE_VALUE
- || stdio->hInputReadyEvent == INVALID_HANDLE_VALUE
+ if (stdio->hInputReadyEvent == INVALID_HANDLE_VALUE
|| stdio->hInputDoneEvent == INVALID_HANDLE_VALUE) {
- fprintf(stderr, "cannot create stdio thread or event\n");
- exit(1);
+ error_setg(errp, "cannot create event");
+ goto err2;
}
if (qemu_add_wait_object(stdio->hInputReadyEvent,
win_stdio_thread_wait_func, chr)) {
- fprintf(stderr, "qemu_add_wait_object: failed\n");
+ error_setg(errp, "qemu_add_wait_object: failed");
+ goto err2;
+ }
+ stdio->hInputThread = CreateThread(NULL, 0, win_stdio_thread,
+ chr, 0, &dwId);
+
+ if (stdio->hInputThread == INVALID_HANDLE_VALUE) {
+ error_setg(errp, "cannot create stdio thread");
+ goto err3;
}
}
@@ -2402,6 +2414,15 @@ static CharDriverState *qemu_chr_open_stdio(ChardevStdio
*opts)
qemu_chr_fe_set_echo(chr, false);
return chr;
+
+err3:
+ qemu_del_wait_object(stdio->hInputReadyEvent, NULL, NULL);
+err2:
+ CloseHandle(stdio->hInputReadyEvent);
+ CloseHandle(stdio->hInputDoneEvent);
+err1:
+ qemu_del_wait_object(stdio->hStdIn, NULL, NULL);
+ return NULL;
}
#endif /* !_WIN32 */
@@ -4330,7 +4351,7 @@ ChardevReturn *qmp_chardev_add(const char *id,
ChardevBackend *backend,
abort();
break;
case CHARDEV_BACKEND_KIND_STDIO:
- chr = qemu_chr_open_stdio(backend->stdio);
+ abort();
break;
#ifdef _WIN32
case CHARDEV_BACKEND_KIND_CONSOLE:
@@ -4420,7 +4441,7 @@ static void register_types(void)
register_char_driver("file", CHARDEV_BACKEND_KIND_FILE,
qemu_chr_parse_file_out, qmp_chardev_open_file);
register_char_driver("stdio", CHARDEV_BACKEND_KIND_STDIO,
- qemu_chr_parse_stdio, NULL);
+ qemu_chr_parse_stdio, qemu_chr_open_stdio);
#if defined HAVE_CHARDEV_SERIAL
register_char_driver("serial", CHARDEV_BACKEND_KIND_SERIAL,
qemu_chr_parse_serial, qmp_chardev_open_serial);
--
2.5.0
- [Qemu-devel] [PULL 31/49] qemu-char: convert UDP backend to data-driven creation, (continued)
- [Qemu-devel] [PULL 31/49] qemu-char: convert UDP backend to data-driven creation, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 35/49] qemu-char: convert msmouse backend to data-driven creation, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 37/49] qemu-char: convert testdev backend to data-driven creation, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 33/49] qemu-char: convert null backend to data-driven creation, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 34/49] qemu-char: convert mux backend to data-driven creation, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 43/49] qemu-char: cleanup after completed conversion to cd->create, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 40/49] qemu-char: convert spice backend to data-driven creation, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 41/49] qemu-char: convert vc backend to data-driven creation, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 36/49] qemu-char: convert braille backend to data-driven creation, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 38/49] qemu-char: convert stdio backend to data-driven creation,
Paolo Bonzini <=
- [Qemu-devel] [PULL 39/49] qemu-char: convert console backend to data-driven creation, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 42/49] qemu-char: convert ringbuf backend to data-driven creation, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 44/49] doc/rcu: fix g_free_rcu() usage example, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 48/49] kvm: Move x86-specific functions into target-i386/kvm.c, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 45/49] kvm: Make KVM_CAP_SIGNAL_MSI globally available, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 46/49] hw/pci: Introduce pci_requester_id(), Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 49/49] kvm: Allow the Hyper-V vendor ID to be specified, Paolo Bonzini, 2015/10/16
- [Qemu-devel] [PULL 47/49] kvm: Pass PCI device pointer to MSI routing functions, Paolo Bonzini, 2015/10/16
- Re: [Qemu-devel] [PULL 00/49] Misc patches for 2015-10-16, Paolo Bonzini, 2015/10/16