From patchwork Wed Apr 25 05:54:13 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Evgeny Voevodin X-Patchwork-Id: 154799 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 22F32B6F13 for ; Wed, 25 Apr 2012 15:54:53 +1000 (EST) Received: from localhost ([::1]:41543 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SMvBj-0002qq-05 for incoming@patchwork.ozlabs.org; Wed, 25 Apr 2012 01:54:51 -0400 Received: from eggs.gnu.org ([208.118.235.92]:61000) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SMvBT-0002py-5f for qemu-devel@nongnu.org; Wed, 25 Apr 2012 01:54:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SMvBQ-0006fL-NU for qemu-devel@nongnu.org; Wed, 25 Apr 2012 01:54:34 -0400 Received: from mailout4.w1.samsung.com ([210.118.77.14]:51853) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SMvBQ-0006Yv-IG for qemu-devel@nongnu.org; Wed, 25 Apr 2012 01:54:32 -0400 MIME-version: 1.0 Content-transfer-encoding: 7BIT Content-type: TEXT/PLAIN Received: from euspt2 ([210.118.77.14]) by mailout4.w1.samsung.com (Sun Java(tm) System Messaging Server 6.3-8.04 (built Jul 29 2009; 32bit)) with ESMTP id <0M3000IVXTR38370@mailout4.w1.samsung.com> for qemu-devel@nongnu.org; Wed, 25 Apr 2012 06:54:39 +0100 (BST) Received: from evvoevodinPC.rnd.samsung.ru ([106.109.9.191]) by spt2.w1.samsung.com (iPlanet Messaging Server 5.2 Patch 2 (built Jul 14 2004)) with ESMTPA id <0M300064STQJKX@spt2.w1.samsung.com> for qemu-devel@nongnu.org; Wed, 25 Apr 2012 06:54:28 +0100 (BST) Date: Wed, 25 Apr 2012 09:54:13 +0400 From: Evgeny Voevodin In-reply-to: <1335333257-5128-1-git-send-email-e.voevodin@samsung.com> To: qemu-devel@nongnu.org Message-id: <1335333257-5128-6-git-send-email-e.voevodin@samsung.com> X-Mailer: git-send-email 1.7.5.4 References: <1335333257-5128-1-git-send-email-e.voevodin@samsung.com> X-detected-operating-system: by eggs.gnu.org: Solaris 9.1 X-Received-From: 210.118.77.14 Cc: peter.maydell@linaro.org, aliguori@us.ibm.com, i.mitsyanko@samsung.com, Evgeny Voevodin , kyungmin.park@samsung.com, d.solodkiy@samsung.com, m.kozlov@samsung.com Subject: [Qemu-devel] [RFC 5/9] hw/virtio-serial-bus.c: Add virtio-serial device. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Evgeny Voevodin --- hw/virtio-serial-bus.c | 42 ++++++++++++++++++++++++++++++++++++++++++ hw/virtio-serial.h | 9 +++++++++ 2 files changed, 51 insertions(+), 0 deletions(-) diff --git a/hw/virtio-serial-bus.c b/hw/virtio-serial-bus.c index e22940e..52a5382 100644 --- a/hw/virtio-serial-bus.c +++ b/hw/virtio-serial-bus.c @@ -24,6 +24,7 @@ #include "sysbus.h" #include "trace.h" #include "virtio-serial.h" +#include "virtio-transport.h" /* The virtio-serial bus on top of which the ports will ride as devices */ struct VirtIOSerialBus { @@ -955,3 +956,44 @@ static void virtio_serial_register_types(void) } type_init(virtio_serial_register_types) + +/******************** VirtIOSer Device **********************/ + +static int virtio_serialdev_init(DeviceState *dev) +{ + VirtIODevice *vdev; + VirtIOSerState *proxy = VIRTIO_SERIAL_FROM_QDEV(dev); + vdev = virtio_serial_init(dev, &proxy->serial); + if (!vdev) { + return -1; + } + return virtio_init_transport(dev, vdev); +} + +static Property virtio_serial_properties[] = { + DEFINE_PROP_UINT32("max_ports", VirtIOSerState, + serial.max_virtserial_ports, 31), + DEFINE_PROP_END_OF_LIST(), +}; + +static void virtio_serial_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(klass); + dc->init = virtio_serialdev_init; + dc->props = virtio_serial_properties; + dc->bus_info = &virtio_transport_bus_info; +} + +static TypeInfo virtio_serial_info = { + .name = "virtio-serial", + .parent = TYPE_DEVICE, + .instance_size = sizeof(VirtIOSerState), + .class_init = virtio_serial_class_init, +}; + +static void virtio_ser_register_types(void) +{ + type_register_static(&virtio_serial_info); +} + +type_init(virtio_ser_register_types) diff --git a/hw/virtio-serial.h b/hw/virtio-serial.h index 16e3982..2290aac 100644 --- a/hw/virtio-serial.h +++ b/hw/virtio-serial.h @@ -15,6 +15,7 @@ #ifndef _QEMU_VIRTIO_SERIAL_H #define _QEMU_VIRTIO_SERIAL_H +#include "sysbus.h" #include "qdev.h" #include "virtio.h" @@ -173,6 +174,14 @@ struct VirtIOSerialPort { bool throttled; }; +typedef struct { + DeviceState qdev; + /* virtio-serial */ + virtio_serial_conf serial; +} VirtIOSerState; + +#define VIRTIO_SERIAL_FROM_QDEV(dev) DO_UPCAST(VirtIOSerState, qdev, dev) + /* Interface to the virtio-serial bus */ /*