From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LMqVk-0008Ca-BX
	for qemu-devel@nongnu.org; Tue, 13 Jan 2009 16:09:20 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LMqVj-0008CG-Hf
	for qemu-devel@nongnu.org; Tue, 13 Jan 2009 16:09:19 -0500
Received: from [199.232.76.173] (port=59890 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LMqVj-0008CD-Cq
	for qemu-devel@nongnu.org; Tue, 13 Jan 2009 16:09:19 -0500
Received: from savannah.gnu.org ([199.232.41.3]:49364 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <INVALID.NOREPLY@gnu.org>)
	id 1LMqVj-0007Lr-2W
	for qemu-devel@nongnu.org; Tue, 13 Jan 2009 16:09:19 -0500
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1LMqVi-0000w5-Tb
	for qemu-devel@nongnu.org; Tue, 13 Jan 2009 21:09:19 +0000
Received: from aliguori by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <aliguori@savannah.gnu.org>) id 1LMqVi-0000w1-LF
	for qemu-devel@nongnu.org; Tue, 13 Jan 2009 21:09:18 +0000
MIME-Version: 1.0
Errors-To: aliguori
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Anthony Liguori <anthony@codemonkey.ws>
Message-Id: <E1LMqVi-0000w1-LF@cvs.savannah.gnu.org>
Date: Tue, 13 Jan 2009 21:09:18 +0000
Subject: [Qemu-devel] [6291] Make virtio_net_init() return void (Mark
	McLoughlin)
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

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