diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2010-09-08 14:26:14 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2010-09-08 14:26:14 -0500 |
| commit | dccbe6fbab47c9a2589f436e0592933b47cbe40b (patch) | |
| tree | e5a851b48a3801dd28282eb17533975cade7ac23 /hw/virtio.h | |
| parent | 630c26893d6dc7713c0fcfc3c09d6bfe536a6ce3 (diff) | |
| parent | a697a334b3c4d3250e6420f5d38550ea10eb5319 (diff) | |
Merge remote branch 'mst/for_anthony' into staging
Diffstat (limited to 'hw/virtio.h')
| -rw-r--r-- | hw/virtio.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/hw/virtio.h b/hw/virtio.h index 5836ab61e7..a60d7355de 100644 --- a/hw/virtio.h +++ b/hw/virtio.h @@ -185,7 +185,9 @@ void virtio_bind_device(VirtIODevice *vdev, const VirtIOBindings *binding, /* Base devices. */ VirtIODevice *virtio_blk_init(DeviceState *dev, BlockConf *conf); -VirtIODevice *virtio_net_init(DeviceState *dev, NICConf *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); VirtIODevice *virtio_balloon_init(DeviceState *dev); #ifdef CONFIG_LINUX |