From ee4c13ce1d1f1c4de2aca613176f30026c6a0905 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 23 Jan 2015 09:48:25 -0500 Subject: [PATCH] aarch64: Support versioned machine types. For distros that want to add versioned machine types, they will add (downstream) machine types like "virt-foo-1.2.3". Detect these as MMIO too. Signed-off-by: Richard W.M. Jones --- src/qemu/qemu_command.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index e793b7e51a..7314006039 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1158,7 +1158,8 @@ qemuDomainAssignARMVirtioMMIOAddresses(virDomainDefPtr def, if (((def->os.arch == VIR_ARCH_ARMV7L) || (def->os.arch == VIR_ARCH_AARCH64)) && (STRPREFIX(def->os.machine, "vexpress-") || - STREQ(def->os.machine, "virt")) && + STREQ(def->os.machine, "virt") || + STRPREFIX(def->os.machine, "virt-")) && virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VIRTIO_MMIO)) { qemuDomainPrimeVirtioDeviceAddresses( def, VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_MMIO); -- GitLab