[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 7/8] virtio-console: Factor out common init between
From: |
Amit Shah |
Subject: |
[Qemu-devel] [PATCH 7/8] virtio-console: Factor out common init between console and generic ports |
Date: |
Thu, 8 Apr 2010 02:32:35 +0530 |
The initialisation for generic ports and console ports is similar.
Factor out the parts that are the same in a different function that can
be called from each of the initfns.
Signed-off-by: Amit Shah <address@hidden>
---
hw/virtio-console.c | 31 ++++++++++++++-----------------
1 files changed, 14 insertions(+), 17 deletions(-)
diff --git a/hw/virtio-console.c b/hw/virtio-console.c
index caea11f..d7fe68b 100644
--- a/hw/virtio-console.c
+++ b/hw/virtio-console.c
@@ -58,24 +58,28 @@ static void chr_event(void *opaque, int event)
}
}
-/* Virtio Console Ports */
-static int virtconsole_initfn(VirtIOSerialDevice *dev)
+static int generic_port_init(VirtConsole *vcon, VirtIOSerialDevice *dev)
{
- VirtIOSerialPort *port = DO_UPCAST(VirtIOSerialPort, dev, &dev->qdev);
- VirtConsole *vcon = DO_UPCAST(VirtConsole, port, port);
-
- port->info = dev->info;
-
- port->is_console = true;
+ vcon->port.info = dev->info;
if (vcon->chr) {
qemu_chr_add_handlers(vcon->chr, chr_can_read, chr_read, chr_event,
vcon);
- port->info->have_data = flush_buf;
+ vcon->port.info->have_data = flush_buf;
}
return 0;
}
+/* Virtio Console Ports */
+static int virtconsole_initfn(VirtIOSerialDevice *dev)
+{
+ VirtIOSerialPort *port = DO_UPCAST(VirtIOSerialPort, dev, &dev->qdev);
+ VirtConsole *vcon = DO_UPCAST(VirtConsole, port, port);
+
+ port->is_console = true;
+ return generic_port_init(vcon, dev);
+}
+
static int virtconsole_exitfn(VirtIOSerialDevice *dev)
{
VirtIOSerialPort *port = DO_UPCAST(VirtIOSerialPort, dev, &dev->qdev);
@@ -115,14 +119,7 @@ static int virtserialport_initfn(VirtIOSerialDevice *dev)
VirtIOSerialPort *port = DO_UPCAST(VirtIOSerialPort, dev, &dev->qdev);
VirtConsole *vcon = DO_UPCAST(VirtConsole, port, port);
- port->info = dev->info;
-
- if (vcon->chr) {
- qemu_chr_add_handlers(vcon->chr, chr_can_read, chr_read, chr_event,
- vcon);
- port->info->have_data = flush_buf;
- }
- return 0;
+ return generic_port_init(vcon, dev);
}
static VirtIOSerialPortInfo virtserialport_info = {
--
1.6.2.5
- [Qemu-devel] [PATCH 0/8] (v2) chardev, virtio-console: flow control, error handling, fixes, Amit Shah, 2010/04/07
- [Qemu-devel] [PATCH 1/8] virtio-serial: throttling: check for throttled status before sending any data, Amit Shah, 2010/04/07
- [Qemu-devel] [PATCH 2/8] virtio-serial: Unthrottle ports once they're closed, Amit Shah, 2010/04/07
- [Qemu-devel] [PATCH 3/8] virtio-serial: Discard unconsumed data before sending port close event, Amit Shah, 2010/04/07
- [Qemu-devel] [PATCH 4/8] virtio-serial: Bus info message for showing port's throttled status, Amit Shah, 2010/04/07
- [Qemu-devel] [PATCH 5/8] char: Let writers know how much data was written in case of errors, Amit Shah, 2010/04/07
- [Qemu-devel] [PATCH 6/8] char: unix: For files that are nonblocking, report -EAGAIN to calling functions, Amit Shah, 2010/04/07
- [Qemu-devel] [PATCH 7/8] virtio-console: Factor out common init between console and generic ports,
Amit Shah <=
- [Qemu-devel] [PATCH 8/8] virtio-console: Throttle virtio-serial-bus if we can't consume any more guest data, Amit Shah, 2010/04/07
[Qemu-devel] Re: [PATCH 0/8] (v2) chardev, virtio-console: flow control, error handling, fixes, Paul Brook, 2010/04/07