[libvirt] [PATCH] 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. --- src/qemu/qemu_command.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 84cbfe1..0d7b155 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: -- 2.1.0
Hello!
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.
Oops, sorry. Indeed, i am actually developing things on Fedora 21 ARM64, and it uses libvirt v1.2.9.2. So for simplicity i base on this version, with some other stuff backported. And i really was not aware of these changes. I will retest. Now i've got motivation to finally rebuild the RPM... Kind regards, Pavel Fedin Expert Engineer Samsung Electronics Research center Russia
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,
Tested and confirm. ACK. Indeed i was unaware of those changes during the development of my series, sorry. Kind regards, Pavel Fedin Expert Engineer Samsung Electronics Research center Russia
On 08/12/2015 03:54 AM, Pavel Fedin wrote:
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, Tested and confirm.
Thanks! I just pushed it.
ACK. Indeed i was unaware of those changes during the development of my series, sorry.
Don't worry about it. There's a lot going in, and it's inevitable that two people will fix the same bug in two different ways.
On Tue, Aug 11, 2015 at 07:24:15PM -0400, Laine Stump wrote:
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. --- src/qemu/qemu_command.c | 8 -------- 1 file changed, 8 deletions(-)
ACK Jan
participants (3)
-
Ján Tomko -
Laine Stump -
Pavel Fedin