diff options
| author | aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-01-13 21:09:18 +0000 |
|---|---|---|
| committer | aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-01-13 21:09:18 +0000 |
| commit | 291c6ff9bf8cec5f7aa3f0da8895bd65b7d9bf93 (patch) | |
| tree | 618d5e4df356df9a67cd1f0c51a118d72ab0b926 | |
| parent | 5a16dc63c7500e30442eaaf88e50017c107dcd09 (diff) | |
Make virtio_net_init() return void (Mark McLoughlin)
All PCI NIC init functions return void and nothing uses the
return value from virtio_net_init().
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6291 c046a42c-6fe2-441c-8c8c-71466251a162
| -rw-r--r-- | hw/virtio-net.c | 6 | ||||
| -rw-r--r-- | hw/virtio-net.h | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/hw/virtio-net.c b/hw/virtio-net.c index 5eca19cd78..54c0030eb3 100644 --- a/hw/virtio-net.c +++ b/hw/virtio-net.c @@ -315,7 +315,7 @@ static int virtio_net_load(QEMUFile *f, void *opaque, int version_id) return 0; } -PCIDevice *virtio_net_init(PCIBus *bus, NICInfo *nd, int devfn) +void virtio_net_init(PCIBus *bus, NICInfo *nd, int devfn) { VirtIONet *n; static int virtio_net_id; @@ -326,7 +326,7 @@ PCIDevice *virtio_net_init(PCIBus *bus, NICInfo *nd, int devfn) sizeof(struct virtio_net_config), sizeof(VirtIONet)); if (!n) - return NULL; + return; n->vdev.get_config = virtio_net_update_config; n->vdev.get_features = virtio_net_get_features; @@ -347,6 +347,4 @@ PCIDevice *virtio_net_init(PCIBus *bus, NICInfo *nd, int devfn) register_savevm("virtio-net", virtio_net_id++, 2, virtio_net_save, virtio_net_load, n); - - return (PCIDevice *)n; } diff --git a/hw/virtio-net.h b/hw/virtio-net.h index 9ac9e34ae1..148ec47126 100644 --- a/hw/virtio-net.h +++ b/hw/virtio-net.h @@ -80,6 +80,6 @@ struct virtio_net_hdr_mrg_rxbuf uint16_t num_buffers; /* Number of merged rx buffers */ }; -PCIDevice *virtio_net_init(PCIBus *bus, NICInfo *nd, int devfn); +void virtio_net_init(PCIBus *bus, NICInfo *nd, int devfn); #endif |