ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>



git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6291 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
aliguori 2009-01-13 21:09:18 +00:00
parent 5a16dc63c7
commit 291c6ff9bf
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/virtio-net.c
View File

@ -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)
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)
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;
} }

2
hw/virtio-net.h
View File

@ -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