summaryrefslogtreecommitdiffstats
path: root/hw/virtio.h
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2011-03-24 08:11:58 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2011-03-24 08:11:58 -0500
commit56d7a964a5664d3778a0b7a369a5f350d0fe099f (patch)
treea851ba09087f5291d2c412981efd6605118a9142 /hw/virtio.h
parent24e838b787959eba0bc516d36224df2c6855d02a (diff)
parent2d6c1ef40f3678ab47a4d14fb5dadaa486bfcda6 (diff)
downloadhqemu-56d7a964a5664d3778a0b7a369a5f350d0fe099f.zip
hqemu-56d7a964a5664d3778a0b7a369a5f350d0fe099f.tar.gz
Merge remote branch 'amit/for-anthony' into staging
Diffstat (limited to 'hw/virtio.h')
-rw-r--r--hw/virtio.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/virtio.h b/hw/virtio.h
index 31d16e1..d0920a8 100644
--- a/hw/virtio.h
+++ b/hw/virtio.h
@@ -195,7 +195,8 @@ VirtIODevice *virtio_blk_init(DeviceState *dev, BlockConf *conf);
struct virtio_net_conf;
VirtIODevice *virtio_net_init(DeviceState *dev, NICConf *conf,
struct virtio_net_conf *net);
-VirtIODevice *virtio_serial_init(DeviceState *dev, uint32_t max_nr_ports);
+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_LINUX
VirtIODevice *virtio_9p_init(DeviceState *dev, V9fsConf *conf);
OpenPOWER on IntegriCloud