[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 1/7] virtio-console: Factor out common init between
From: |
Amit Shah |
Subject: |
[Qemu-devel] [PATCH 1/7] virtio-console: Factor out common init between console and generic ports |
Date: |
Wed, 19 Jan 2011 17:57:13 +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.7.3.4
- [Qemu-devel] [PATCH 0/7] virtio-serial: Don't copy guest buf to host, flow control, Amit Shah, 2011/01/19
- [Qemu-devel] [PATCH 1/7] virtio-console: Factor out common init between console and generic ports,
Amit Shah <=
- [Qemu-devel] [PATCH 2/7] virtio-console: Remove unnecessary braces, Amit Shah, 2011/01/19
- [Qemu-devel] [PATCH 3/7] virtio-serial-bus: separate out discard logic in a separate function, Amit Shah, 2011/01/19
- [Qemu-devel] [PATCH 4/7] virtio-serial: Don't copy over guest buffer to host, Amit Shah, 2011/01/19
- [Qemu-devel] [PATCH 7/7] virtio-serial: save/restore new fields in port struct, Amit Shah, 2011/01/19
- [Qemu-devel] [PATCH 6/7] virtio-serial: Add support for flow control, Amit Shah, 2011/01/19
- [Qemu-devel] [PATCH 5/7] virtio-serial: Let virtio-serial-bus know if all data was consumed, Amit Shah, 2011/01/19