From 2709a8417d7254656bdacf28eae3dfea5a473601 Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc@redhat.com>
Date: Thu, 15 Jan 2009 13:47:25 +0000
Subject: [PATCH 39/54] kvm: qemu: fix the prototype of virtio_net_init()

NIC init functions don't return a PCIDevice pointer in upstream QEMU
but they do in KVM for hotplug.

Fixes:

  qemu/hw/pci.c:740: warning: initialization from incompatible pointer type

Signed-off-by: Mark McLoughlin <markmc@redhat.com>
RH-Upstream-status: applied(kvm/master), pending(maint/2.6.29)
RH-Acked-by: Mark McLoughlin <markmc@redhat.com>
---
 qemu/hw/virtio-net.c |    6 ++++--
 qemu/hw/virtio-net.h |    2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/qemu/hw/virtio-net.c b/qemu/hw/virtio-net.c
index 04c8438..8efd438 100644
--- a/qemu/hw/virtio-net.c
+++ b/qemu/hw/virtio-net.c
@@ -409,7 +409,7 @@ static int virtio_net_load(QEMUFile *f, void *opaque, int version_id)
     return 0;
 }
 
-void virtio_net_init(PCIBus *bus, NICInfo *nd, int devfn)
+PCIDevice *virtio_net_init(PCIBus *bus, NICInfo *nd, int devfn)
 {
     VirtIONet *n;
     static int virtio_net_id;
@@ -423,7 +423,7 @@ void virtio_net_init(PCIBus *bus, NICInfo *nd, int devfn)
                                      sizeof(struct virtio_net_config),
                                      sizeof(VirtIONet));
     if (!n)
-        return;
+        return NULL;
 
     n->vdev.get_config = virtio_net_update_config;
     n->vdev.get_features = virtio_net_get_features;
@@ -444,4 +444,6 @@ void 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/qemu/hw/virtio-net.h b/qemu/hw/virtio-net.h
index 148ec47..9ac9e34 100644
--- a/qemu/hw/virtio-net.h
+++ b/qemu/hw/virtio-net.h
@@ -80,6 +80,6 @@ struct virtio_net_hdr_mrg_rxbuf
     uint16_t num_buffers;   /* Number of merged rx buffers */
 };
 
-void virtio_net_init(PCIBus *bus, NICInfo *nd, int devfn);
+PCIDevice *virtio_net_init(PCIBus *bus, NICInfo *nd, int devfn);
 
 #endif
-- 
1.6.1