These patches apply on top of the series I just posted: [PATCH 0/9] tests: qemu: unconditionally enable QEMU_CAPS_DEVICE https://www.redhat.com/archives/libvir-list/2016-January/msg01233.html These specific changers were discussed here: https://www.redhat.com/archives/libvir-list/2015-December/msg00217.html We need a way for apps to tell libvirt 'use virtio-pci not virtio-mmio' for aarch64 -M virt. We can't really make use this by default yet since most OS don't actually support it. So we decided the best course of interaction is to allow users to pass a manual pci controller, and libvirt will interpret that to mean it's okay to use virtio-pci. Patch #1 undoes the current behavior of unconditionally adding a q35 style PCIe controller setup for mach-virt that supports it. In the future we will probably re-enable something like this, but maybe not for a year or so until the bits proliferate to distros. Patch #2 tries to implement the manual pci controller bit. Unfortunately it's not that easy get the ideal XML to work, so this isn't ready for committing. See the commit message for more details Cole Robinson (2): qemu: aarch64: Don't add PCIe controller by default HACK: qemu: aarch64: Use virtio-pci if user specifies PCI controller src/qemu/qemu_command.c | 34 ++++++++---- src/qemu/qemu_domain.c | 4 -- ...l2argv-aarch64-pci-manual-nocontroller-fail.xml | 43 ++++++++++++++++ .../qemuxml2argv-aarch64-virtio-pci-default.args | 2 - ...l2argv-aarch64-virtio-pci-manual-addresses.args | 2 - ...ml2argv-aarch64-virtio-pci-manual-addresses.xml | 1 + ...2argv-aarch64-virtio-pci-manual-controller.args | 36 +++++++++++++ ...l2argv-aarch64-virtio-pci-manual-controller.xml | 50 ++++++++++++++++++ tests/qemuxml2argvtest.c | 22 ++++++-- .../qemuxml2xmlout-aarch64-virtio-pci-default.xml | 10 ---- ...2xmlout-aarch64-virtio-pci-manual-addresses.xml | 11 +--- ...xmlout-aarch64-virtio-pci-manual-controller.xml | 60 ++++++++++++++++++++++ tests/qemuxml2xmltest.c | 6 +++ 13 files changed, 239 insertions(+), 42 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-pci-manual-nocontroller-fail.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci-manual-controller.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci-manual-controller.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-virtio-pci-manual-controller.xml -- 2.5.0 -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list