From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:54034) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RhmB8-0007OX-N7 for qemu-devel@nongnu.org; Mon, 02 Jan 2012 13:00:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RhmB7-000142-6u for qemu-devel@nongnu.org; Mon, 02 Jan 2012 13:00:10 -0500 Received: from mail-gy0-f173.google.com ([209.85.160.173]:54528) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RhmB7-00013s-2v for qemu-devel@nongnu.org; Mon, 02 Jan 2012 13:00:09 -0500 Received: by ghbg16 with SMTP id g16so6033819ghb.4 for ; Mon, 02 Jan 2012 10:00:08 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 2 Jan 2012 18:59:23 +0100 Message-Id: <1325527166-23898-13-git-send-email-pbonzini@redhat.com> In-Reply-To: <1325527166-23898-1-git-send-email-pbonzini@redhat.com> References: <1325527166-23898-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH v2 12/15] virtio-serial: move init function to virtio-serial.h List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mst@redhat.com Signed-off-by: Paolo Bonzini --- hw/virtio-serial.h | 7 +++++-- hw/virtio.h | 3 --- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/virtio-serial.h b/hw/virtio-serial.h index 2e1a428..8469956 100644 --- a/hw/virtio-serial.h +++ b/hw/virtio-serial.h @@ -45,10 +45,10 @@ struct virtio_console_control { uint16_t value; /* Extra information for the key */ }; -struct virtio_serial_conf { +typedef struct virtio_serial_conf { /* Max. number of ports we can have for a virtio-serial device */ uint32_t max_virtserial_ports; -}; +} virtio_serial_conf; /* Some events for the internal messages (control packets) */ #define VIRTIO_CONSOLE_DEVICE_READY 0 @@ -166,6 +166,9 @@ struct VirtIOSerialPortInfo { size_t len); }; +VirtIODevice *virtio_serial_init(DeviceState *dev, virtio_serial_conf *serial); +void virtio_serial_exit(VirtIODevice *vdev); + /* Interface to the virtio-serial bus */ /* diff --git a/hw/virtio.h b/hw/virtio.h index b4ef022..3cf2e25 100644 --- a/hw/virtio.h +++ b/hw/virtio.h @@ -193,8 +193,6 @@ void virtio_bind_device(VirtIODevice *vdev, const VirtIOBindings *binding, /* Base devices. */ typedef struct VirtIOBlkConf VirtIOBlkConf; VirtIODevice *virtio_blk_init(DeviceState *dev, VirtIOBlkConf *blk); -typedef struct virtio_serial_conf virtio_serial_conf; -VirtIODevice *virtio_serial_init(DeviceState *dev, virtio_serial_conf *serial); VirtIODevice *virtio_balloon_init(DeviceState *dev); #ifdef CONFIG_VIRTFS VirtIODevice *virtio_9p_init(DeviceState *dev, V9fsConf *conf); @@ -202,7 +200,6 @@ VirtIODevice *virtio_9p_init(DeviceState *dev, V9fsConf *conf); void virtio_blk_exit(VirtIODevice *vdev); -void virtio_serial_exit(VirtIODevice *vdev); void virtio_balloon_exit(VirtIODevice *vdev); #define DEFINE_VIRTIO_COMMON_FEATURES(_state, _field) \ -- 1.7.7.1