提交 291c6ff9 编写于 作者: A aliguori

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: NMark McLoughlin <markmc@redhat.com>
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>



git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6291 c046a42c-6fe2-441c-8c8c-71466251a162
上级 5a16dc63
...@@ -315,7 +315,7 @@ static int virtio_net_load(QEMUFile *f, void *opaque, int version_id) ...@@ -315,7 +315,7 @@ static int virtio_net_load(QEMUFile *f, void *opaque, int version_id)
return 0; return 0;
} }
PCIDevice *virtio_net_init(PCIBus *bus, NICInfo *nd, int devfn) void virtio_net_init(PCIBus *bus, NICInfo *nd, int devfn)
{ {
VirtIONet *n; VirtIONet *n;
static int virtio_net_id; static int virtio_net_id;
...@@ -326,7 +326,7 @@ PCIDevice *virtio_net_init(PCIBus *bus, NICInfo *nd, int devfn) ...@@ -326,7 +326,7 @@ PCIDevice *virtio_net_init(PCIBus *bus, NICInfo *nd, int devfn)
sizeof(struct virtio_net_config), sizeof(struct virtio_net_config),
sizeof(VirtIONet)); sizeof(VirtIONet));
if (!n) if (!n)
return NULL; return;
n->vdev.get_config = virtio_net_update_config; n->vdev.get_config = virtio_net_update_config;
n->vdev.get_features = virtio_net_get_features; n->vdev.get_features = virtio_net_get_features;
...@@ -347,6 +347,4 @@ PCIDevice *virtio_net_init(PCIBus *bus, NICInfo *nd, int devfn) ...@@ -347,6 +347,4 @@ PCIDevice *virtio_net_init(PCIBus *bus, NICInfo *nd, int devfn)
register_savevm("virtio-net", virtio_net_id++, 2, register_savevm("virtio-net", virtio_net_id++, 2,
virtio_net_save, virtio_net_load, n); virtio_net_save, virtio_net_load, n);
return (PCIDevice *)n;
} }
...@@ -80,6 +80,6 @@ struct virtio_net_hdr_mrg_rxbuf ...@@ -80,6 +80,6 @@ struct virtio_net_hdr_mrg_rxbuf
uint16_t num_buffers; /* Number of merged rx buffers */ 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 #endif
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册