[Qemu-devel] [6291] Make virtio_net_init() return void (Mark McLoughlin)

[Qemu-devel] [6291] Make virtio_net_init() return void (Mark McLoughlin)

[Anthony Liguori]

Revision: 6291
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6291
Author:   aliguori
Date:     2009-01-13 21:09:18 +0000 (Tue, 13 Jan 2009)

Log Message:
-----------
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>

Modified Paths:
--------------
    trunk/hw/virtio-net.c
    trunk/hw/virtio-net.h

Modified: trunk/hw/virtio-net.c
===================================================================
--- trunk/hw/virtio-net.c	2009-01-13 20:08:43 UTC (rev 6290)
+++ trunk/hw/virtio-net.c	2009-01-13 21:09:18 UTC (rev 6291)
@@ -315,7 +315,7 @@
     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 @@
                                      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 @@
 
     register_savevm("virtio-net", virtio_net_id++, 2,
                     virtio_net_save, virtio_net_load, n);
-
-    return (PCIDevice *)n;
 }

Modified: trunk/hw/virtio-net.h
===================================================================
--- trunk/hw/virtio-net.h	2009-01-13 20:08:43 UTC (rev 6290)
+++ trunk/hw/virtio-net.h	2009-01-13 21:09:18 UTC (rev 6291)
@@ -80,6 +80,6 @@
     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