From: Laine Stump <laine@laine.org>
Date: Tue, 11 Aug 2015 23:07:53 +0000 (-0400)
Subject: Revert "qemu: Allow to plug virtio-net-pci into PCIe slot"
X-Git-Tag: v1.2.19-rc1~82
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5e6d1cfc74b6144d9bc1183b7d111a029ee3fdb;p=thirdparty%2Flibvirt.git

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

This reverts commit ede34470fde19c0f326cdb0dfca39fa86fd9ec16, 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.
---

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 84cbfe1b4d..0d7b1559a5 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -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: