From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O2KHB-0005ON-9I for qemu-devel@nongnu.org; Thu, 15 Apr 2010 04:18:17 -0400 Received: from [140.186.70.92] (port=34947 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O2KH9-0005N5-Qp for qemu-devel@nongnu.org; Thu, 15 Apr 2010 04:18:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O2KH8-0001Bn-Gg for qemu-devel@nongnu.org; Thu, 15 Apr 2010 04:18:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55907) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O2KH7-0001Bc-JG for qemu-devel@nongnu.org; Thu, 15 Apr 2010 04:18:14 -0400 From: Amit Shah Date: Thu, 15 Apr 2010 13:46:17 +0530 Message-Id: <1271319378-9811-4-git-send-email-amit.shah@redhat.com> In-Reply-To: <1271319378-9811-3-git-send-email-amit.shah@redhat.com> References: <1271319378-9811-1-git-send-email-amit.shah@redhat.com> <1271319378-9811-2-git-send-email-amit.shah@redhat.com> <1271319378-9811-3-git-send-email-amit.shah@redhat.com> Subject: [Qemu-devel] [PATCH v3 3/4] virtio-console: Factor out common init between console and generic ports List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu list Cc: Amit Shah , Gerd Hoffmann , paul@codesourcery.com 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 --- 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 2bccdd0..1552f47 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, NULL, 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, - NULL, 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