[Qemu-devel] [PATCH 3/4] 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 <address@hidden>
---
 hw/virtio-net.c |    6 ++----
 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 de1f7ce..43fde20 100644
--- a/hw/virtio-net.c
+++ b/hw/virtio-net.c
@@ -299,7 +299,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;
@@ -309,7 +309,7 @@ PCIDevice *virtio_net_init(PCIBus *bus, NICInfo *nd, int 
devfn)
                                      0x02, 0x00, 0x00,
                                      6, sizeof(VirtIONet));
     if (!n)
-        return NULL;
+        return;
 
     n->vdev.get_config = virtio_net_update_config;
     n->vdev.get_features = virtio_net_get_features;
@@ -328,6 +328,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 0d9f71b..7446b11 100644
--- a/hw/virtio-net.h
+++ b/hw/virtio-net.h
@@ -75,6 +75,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
-- 
1.6.0.6