mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

virtio-net: pass host features to virtio_net_init

Browse Source 
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Anthony Liguori 2013-02-05 17:47:15 -06:00
parent b890492110
commit 1e89ad5b00
5 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/s390x/s390-virtio-bus.c
View File

@ -153,7 +153,8 @@ static int s390_virtio_net_init(VirtIOS390Device *dev)
{ {
VirtIODevice *vdev; VirtIODevice *vdev;
vdev = virtio_net_init((DeviceState *)dev, &dev->nic, &dev->net); vdev = virtio_net_init((DeviceState *)dev, &dev->nic, &dev->net,
dev->host_features);
if (!vdev) { if (!vdev) {
return -1; return -1;
} }

3
hw/s390x/virtio-ccw.c
View File

@ -555,7 +555,8 @@ static int virtio_ccw_net_init(VirtioCcwDevice *dev)
{ {
VirtIODevice *vdev; VirtIODevice *vdev;
vdev = virtio_net_init((DeviceState *)dev, &dev->nic, &dev->net); vdev = virtio_net_init((DeviceState *)dev, &dev->nic, &dev->net,
dev->host_features[0]);
if (!vdev) { if (!vdev) {
return -1; return -1;
} }

3
hw/virtio-net.c
View File

@ -1279,7 +1279,8 @@ static void virtio_net_guest_notifier_mask(VirtIODevice *vdev, int idx,
} }
VirtIODevice *virtio_net_init(DeviceState *dev, NICConf *conf, VirtIODevice *virtio_net_init(DeviceState *dev, NICConf *conf,
virtio_net_conf *net) virtio_net_conf *net,
uint32_t host_features)
{ {
VirtIONet *n; VirtIONet *n;
int i; int i;

3
hw/virtio-pci.c
View File

@ -997,7 +997,8 @@ static int virtio_net_init_pci(PCIDevice *pci_dev)
VirtIOPCIProxy *proxy = DO_UPCAST(VirtIOPCIProxy, pci_dev, pci_dev); VirtIOPCIProxy *proxy = DO_UPCAST(VirtIOPCIProxy, pci_dev, pci_dev);
VirtIODevice *vdev; VirtIODevice *vdev;
vdev = virtio_net_init(&pci_dev->qdev, &proxy->nic, &proxy->net); vdev = virtio_net_init(&pci_dev->qdev, &proxy->nic, &proxy->net,
proxy->host_features);
vdev->nvectors = proxy->nvectors; vdev->nvectors = proxy->nvectors;
virtio_init_pci(proxy, vdev); virtio_init_pci(proxy, vdev);

3
hw/virtio.h
View File

@ -243,7 +243,8 @@ typedef struct VirtIOBlkConf VirtIOBlkConf;
VirtIODevice *virtio_blk_init(DeviceState *dev, VirtIOBlkConf *blk); VirtIODevice *virtio_blk_init(DeviceState *dev, VirtIOBlkConf *blk);
struct virtio_net_conf; struct virtio_net_conf;
VirtIODevice *virtio_net_init(DeviceState *dev, NICConf *conf, VirtIODevice *virtio_net_init(DeviceState *dev, NICConf *conf,
struct virtio_net_conf *net); struct virtio_net_conf *net,
uint32_t host_features);
typedef struct virtio_serial_conf virtio_serial_conf; typedef struct virtio_serial_conf virtio_serial_conf;
VirtIODevice *virtio_serial_init(DeviceState *dev, virtio_serial_conf *serial); VirtIODevice *virtio_serial_init(DeviceState *dev, virtio_serial_conf *serial);
VirtIODevice *virtio_balloon_init(DeviceState *dev); VirtIODevice *virtio_balloon_init(DeviceState *dev);