[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 39/49] qemu-char: convert console backend to data-dri
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 39/49] qemu-char: convert console backend to data-driven creation |
Date: |
Fri, 16 Oct 2015 10:50:01 +0200 |
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
qemu-char.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/qemu-char.c b/qemu-char.c
index 2b24a5c..aa9dae2 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));
}
@@ -4353,11 +4356,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);
@@ -4458,8 +4459,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,
--
2.5.0
- [Qemu-devel] [PULL 35/49] qemu-char: convert msmouse backend to data-driven creation, (continued)
- [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, 2015/10/16
- [Qemu-devel] [PULL 39/49] qemu-char: convert console backend to data-driven creation,
Paolo Bonzini <=
- [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