diff options
| author | Peter Maydell | 2018-10-03 15:07:49 +0200 |
|---|---|---|
| committer | Peter Maydell | 2018-10-03 15:07:49 +0200 |
| commit | b8e5671a8cd196e7262802ca895bf87d50416989 (patch) | |
| tree | e4fa16d504ec2bb2249a374c742ee8ccac12111b /hw/char/xen_console.c | |
| parent | Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (diff) | |
| parent | chardev: use a child source for qio input source (diff) | |
| download | qemu-b8e5671a8cd196e7262802ca895bf87d50416989.tar.gz qemu-b8e5671a8cd196e7262802ca895bf87d50416989.tar.xz qemu-b8e5671a8cd196e7262802ca895bf87d50416989.zip | |
Merge remote-tracking branch 'remotes/elmarco/tags/chardev-pull-request' into staging
chardev patches
# gpg: Signature made Wed 03 Oct 2018 11:57:34 BST
# gpg: using RSA key DAE8E10975969CE5
# gpg: Good signature from "Marc-André Lureau <marcandre.lureau@redhat.com>"
# gpg: aka "Marc-André Lureau <marcandre.lureau@gmail.com>"
# Primary key fingerprint: 87A9 BD93 3F87 C606 D276 F62D DAE8 E109 7596 9CE5
* remotes/elmarco/tags/chardev-pull-request:
chardev: use a child source for qio input source
chardev: mark the calls that allow an implicit mux monitor
char.h: fix gtk-doc comment style
chardev: unref if underlying chardev has no parent
chardev: remove qemu_chr_fe_read_all() counter
chardev: avoid crash if no associated address
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/char/xen_console.c')
| -rw-r--r-- | hw/char/xen_console.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/hw/char/xen_console.c b/hw/char/xen_console.c index 8b4b4bf523..44f7236382 100644 --- a/hw/char/xen_console.c +++ b/hw/char/xen_console.c @@ -207,7 +207,11 @@ static int con_init(struct XenDevice *xendev) } else { snprintf(label, sizeof(label), "xencons%d", con->xendev.dev); qemu_chr_fe_init(&con->chr, - qemu_chr_new(label, output), &error_abort); + /* + * FIXME: sure we want to support implicit + * muxed monitors here? + */ + qemu_chr_new_mux_mon(label, output), &error_abort); } xenstore_store_pv_console_info(con->xendev.dev, |