[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 12/15] virtio-serial: move init function to virti
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH v2 12/15] virtio-serial: move init function to virtio-serial.h |
Date: |
Mon, 2 Jan 2012 18:59:23 +0100 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
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
- [Qemu-devel] [PATCH v2 01/15] virtio-net: move property declarations to header file, (continued)
- [Qemu-devel] [PATCH v2 01/15] virtio-net: move property declarations to header file, Paolo Bonzini, 2012/01/02
- [Qemu-devel] [PATCH v2 02/15] virtio-net: move NICConf into virtio_net_conf, Paolo Bonzini, 2012/01/02
- [Qemu-devel] [PATCH v2 03/15] virtio-serial: move property declarations to header file, Paolo Bonzini, 2012/01/02
- [Qemu-devel] [PATCH v2 05/15] virtio-9p: remove PCI dependencies from hw/9pfs/, Paolo Bonzini, 2012/01/02
- [Qemu-devel] [PATCH v2 04/15] virtio-9p: use CONFIG_VIRTFS, not CONFIG_LINUX, Paolo Bonzini, 2012/01/02
- [Qemu-devel] [PATCH v2 06/15] virtio-9p: move property declarations to header file, Paolo Bonzini, 2012/01/02
- [Qemu-devel] [PATCH v2 07/15] virtio-blk: define VirtIOBlkConf, Paolo Bonzini, 2012/01/02
- [Qemu-devel] [PATCH v2 08/15] virtio-blk: move property declarations to header file, Paolo Bonzini, 2012/01/02
- [Qemu-devel] [PATCH v2 09/15] virtio-blk: move BlockConf into VirtIOBlkConf, Paolo Bonzini, 2012/01/02
- [Qemu-devel] [PATCH v2 11/15] virtio-net: move init function to virtio-net.h, Paolo Bonzini, 2012/01/02
- [Qemu-devel] [PATCH v2 12/15] virtio-serial: move init function to virtio-serial.h,
Paolo Bonzini <=
- [Qemu-devel] [PATCH v2 13/15] virtio-balloon: move init function to virtio-balloon.h, Paolo Bonzini, 2012/01/02
- [Qemu-devel] [PATCH v2 14/15] virtio-9p: move init function to virtio-9p-device.h, Paolo Bonzini, 2012/01/02
- [Qemu-devel] [PATCH v2 15/15] virtio-blk: move init function to virtio-blk.h, Paolo Bonzini, 2012/01/02
- [Qemu-devel] [PATCH v2 10/15] virtio: move conf fields into an anonymous union, Paolo Bonzini, 2012/01/02