diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2015-09-29 15:42:04 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2015-10-19 10:13:07 +0200 |
| commit | 122e5ed4412cadce2d44a5f636e4d1bfc67c534b (patch) | |
| tree | 966e7da789876d656396e76d63139a9b69d0d02e /qemu-char.c | |
| parent | 8c84b25d975870bbed2e089fe61e037c58a69854 (diff) | |
| download | focaccia-qemu-122e5ed4412cadce2d44a5f636e4d1bfc67c534b.tar.gz focaccia-qemu-122e5ed4412cadce2d44a5f636e4d1bfc67c534b.zip | |
qemu-char: convert console backend to data-driven creation
Reviewed-by: Eric Blake <eblake@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'qemu-char.c')
| -rw-r--r-- | qemu-char.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/qemu-char.c b/qemu-char.c index faeffd4698..b74d6aa087 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -2204,7 +2204,10 @@ static CharDriverState *qemu_chr_open_win_file(HANDLE fd_out) return chr; } -static CharDriverState *qemu_chr_open_win_con(void) +static CharDriverState *qemu_chr_open_win_con(const char *id, + ChardevBackend *backend, + ChardevReturn *ret, + Error **errp) { return qemu_chr_open_win_file(GetStdHandle(STD_OUTPUT_HANDLE)); } @@ -4344,11 +4347,9 @@ ChardevReturn *qmp_chardev_add(const char *id, ChardevBackend *backend, case CHARDEV_BACKEND_KIND_STDIO: abort(); break; -#ifdef _WIN32 case CHARDEV_BACKEND_KIND_CONSOLE: - chr = qemu_chr_open_win_con(); + abort(); break; -#endif #ifdef CONFIG_SPICE case CHARDEV_BACKEND_KIND_SPICEVMC: chr = qemu_chr_open_spice_vmc(backend->spicevmc->type); @@ -4449,8 +4450,10 @@ static void register_types(void) register_char_driver("pty", CHARDEV_BACKEND_KIND_PTY, NULL, qemu_chr_open_pty); #endif +#ifdef _WIN32 register_char_driver("console", CHARDEV_BACKEND_KIND_CONSOLE, NULL, - NULL); + qemu_chr_open_win_con); +#endif register_char_driver("pipe", CHARDEV_BACKEND_KIND_PIPE, qemu_chr_parse_pipe, qemu_chr_open_pipe); register_char_driver("mux", CHARDEV_BACKEND_KIND_MUX, qemu_chr_parse_mux, |