From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LMotL-0004fP-Q1 for qemu-devel@nongnu.org; Tue, 13 Jan 2009 14:25:35 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LMotK-0004dW-V4 for qemu-devel@nongnu.org; Tue, 13 Jan 2009 14:25:35 -0500 Received: from [199.232.76.173] (port=59814 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LMotK-0004d4-M5 for qemu-devel@nongnu.org; Tue, 13 Jan 2009 14:25:34 -0500 Received: from mail14.svc.cra.dublin.eircom.net ([159.134.118.30]:43569) by monty-python.gnu.org with smtp (Exim 4.60) (envelope-from ) id 1LMotK-0001Qs-AI for qemu-devel@nongnu.org; Tue, 13 Jan 2009 14:25:34 -0500 From: Mark McLoughlin Date: Tue, 13 Jan 2009 19:25:16 +0000 Message-Id: <1231874717-8835-2-git-send-email-markmc@redhat.com> In-Reply-To: <1231874717-8835-1-git-send-email-markmc@redhat.com> References: <1231426069-28321-1-git-send-email-markmc@redhat.com> <1231874717-8835-1-git-send-email-markmc@redhat.com> Subject: [Qemu-devel] [PATCH 2/3] Make virtio_net_init() return void Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: Mark McLoughlin , qemu-devel@nongnu.org All PCI NIC init functions return void and nothing uses the return value from virtio_net_init(). Signed-off-by: Mark McLoughlin --- 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 5eca19c..54c0030 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 9ac9e34..148ec47 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 -- 1.6.0.6