Revert "qemu: Allow to plug virtio-net-pci into PCIe slot"

This reverts commit ede34470fd, which
was apparently written based on testing performed before commits
1e15be1 and 9a12b6 were pushed upstream. Once those two patches are in
place, commit ede34470 is redundant, and can even cause
incorrect/unexpected behavior when auto-assigning addresses for
virtio-net devices.
This commit is contained in:
Laine Stump 2015-08-11 19:07:53 -04:00
parent 68b2405c67
commit d5e6d1cfc7

View File

@ -1680,14 +1680,6 @@ qemuCollectPCIAddress(virDomainDefPtr def ATTRIBUTE_UNUSED,
*/
flags = VIR_PCI_CONNECT_TYPE_PCI | VIR_PCI_CONNECT_TYPE_PCIE;
break;
case VIR_DOMAIN_DEVICE_NET:
if (STREQ(device->data.net->model, "virtio")) {
/* virtio-net-pci adapter in qemu has to be plugged into PCIe slot
* in order to be able to use irqfds with vhost-net
*/
flags = VIR_PCI_CONNECT_TYPE_PCI | VIR_PCI_CONNECT_TYPE_PCIE;
}
}
/* Ignore implicit controllers on slot 0:0:1.0: