[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 18/41] virtio-console: chardev hotswap support
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 18/41] virtio-console: chardev hotswap support |
Date: |
Thu, 13 Jul 2017 16:24:11 +0200 |
From: Anton Nefedov <address@hidden>
In case of a backend change, the handler functions and the watch have
to be reset.
Signed-off-by: Anton Nefedov <address@hidden>
Reviewed-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/char/virtio-console.c | 30 ++++++++++++++++++++++++++++--
1 file changed, 28 insertions(+), 2 deletions(-)
diff --git a/hw/char/virtio-console.c b/hw/char/virtio-console.c
index 4d3967c..198b2a8 100644
--- a/hw/char/virtio-console.c
+++ b/hw/char/virtio-console.c
@@ -163,6 +163,30 @@ static void chr_event(void *opaque, int event)
}
}
+static int chr_be_change(void *opaque)
+{
+ VirtConsole *vcon = opaque;
+ VirtIOSerialPort *port = VIRTIO_SERIAL_PORT(vcon);
+ VirtIOSerialPortClass *k = VIRTIO_SERIAL_PORT_GET_CLASS(port);
+
+ if (k->is_console) {
+ qemu_chr_fe_set_handlers(&vcon->chr, chr_can_read, chr_read,
+ NULL, chr_be_change, vcon, NULL, true);
+ } else {
+ qemu_chr_fe_set_handlers(&vcon->chr, chr_can_read, chr_read,
+ chr_event, chr_be_change, vcon, NULL, false);
+ }
+
+ if (vcon->watch) {
+ g_source_remove(vcon->watch);
+ vcon->watch = qemu_chr_fe_add_watch(&vcon->chr,
+ G_IO_OUT | G_IO_HUP,
+ chr_write_unblocked, vcon);
+ }
+
+ return 0;
+}
+
static void virtconsole_realize(DeviceState *dev, Error **errp)
{
VirtIOSerialPort *port = VIRTIO_SERIAL_PORT(dev);
@@ -187,11 +211,13 @@ static void virtconsole_realize(DeviceState *dev, Error
**errp)
*/
if (k->is_console) {
qemu_chr_fe_set_handlers(&vcon->chr, chr_can_read, chr_read,
- NULL, NULL, vcon, NULL, true);
+ NULL, chr_be_change,
+ vcon, NULL, true);
virtio_serial_open(port);
} else {
qemu_chr_fe_set_handlers(&vcon->chr, chr_can_read, chr_read,
- chr_event, NULL, vcon, NULL, false);
+ chr_event, chr_be_change,
+ vcon, NULL, false);
}
}
}
--
1.8.3.1
- [Qemu-devel] [PULL 23/41] mttcg/i386: Patch instruction using async_safe_* framework, (continued)
- [Qemu-devel] [PULL 23/41] mttcg/i386: Patch instruction using async_safe_* framework, Paolo Bonzini, 2017/07/13
- [Qemu-devel] [PULL 27/41] gdbstub: don't fail on vCont; C04:0; c packets, Paolo Bonzini, 2017/07/13
- [Qemu-devel] [PULL 25/41] gdbstub: rename cpu_index -> cpu_gdb_index, Paolo Bonzini, 2017/07/13
- [Qemu-devel] [PULL 28/41] chardev: fix parallel device can't be reconnect, Paolo Bonzini, 2017/07/13
- [Qemu-devel] [PULL 34/41] nbd: Simplify trace of client flags in negotiation, Paolo Bonzini, 2017/07/13
- [Qemu-devel] [PULL 35/41] nbd: Refactor reply to NBD_OPT_EXPORT_NAME, Paolo Bonzini, 2017/07/13
- [Qemu-devel] [PULL 36/41] nbd: Implement NBD_OPT_GO on server, Paolo Bonzini, 2017/07/13
- [Qemu-devel] [PULL 41/41] translate-all: remove redundant !tcg_enabled check in dump_exec_info, Paolo Bonzini, 2017/07/13
- [Qemu-devel] [PULL 09/41] char: add backend hotswap handler, Paolo Bonzini, 2017/07/13
- [Qemu-devel] [PULL 11/41] char: forbid direct chardevice access for hotswap devices, Paolo Bonzini, 2017/07/13
- [Qemu-devel] [PULL 18/41] virtio-console: chardev hotswap support,
Paolo Bonzini <=
- [Qemu-devel] [PULL 20/41] serial: chardev hotswap support, Paolo Bonzini, 2017/07/13
- [Qemu-devel] [PULL 22/41] Revert "exec.c: Fix breakpoint invalidation race", Paolo Bonzini, 2017/07/13
- [Qemu-devel] [PULL 24/41] gdbstub: modernise DEBUG_GDB, Paolo Bonzini, 2017/07/13
- [Qemu-devel] [PULL 26/41] qom/cpu: remove host_tid field, Paolo Bonzini, 2017/07/13
- [Qemu-devel] [PULL 29/41] memory/iommu: QOM'fy IOMMU MemoryRegion, Paolo Bonzini, 2017/07/13
- [Qemu-devel] [PULL 30/41] memory/iommu: introduce IOMMUMemoryRegionClass, Paolo Bonzini, 2017/07/13
- [Qemu-devel] [PULL 31/41] nbd: Create struct for tracking export info, Paolo Bonzini, 2017/07/13
- [Qemu-devel] [PULL 32/41] nbd: Don't bother tracing an NBD_OPT_ABORT response failure, Paolo Bonzini, 2017/07/13
- [Qemu-devel] [PULL 33/41] nbd: Expose and debug more NBD constants, Paolo Bonzini, 2017/07/13
- [Qemu-devel] [PULL 39/41] nbd: Implement NBD_INFO_BLOCK_SIZE on client, Paolo Bonzini, 2017/07/13