diff options
| author | Richard W.M. Jones <rjones@redhat.com> | 2015-01-23 09:48:25 -0500 |
|---|---|---|
| committer | Richard W.M. Jones <rjones@redhat.com> | 2015-01-23 15:12:33 +0000 |
| commit | ee4c13ce1d1f1c4de2aca613176f30026c6a0905 (patch) | |
| tree | 052a65849645aa6f502655389a3683e8e766b68a | |
| parent | b7e6f2fc805c389e82c635ce10dde379224df92d (diff) | |
| download | libvirt-ee4c13ce1d1f1c4de2aca613176f30026c6a0905.tar.gz | |
aarch64: Support versioned machine types.v1.2.12-rc2
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 <rjones@redhat.com>
| -rw-r--r-- | src/qemu/qemu_command.c | 3 |
1 files changed, 2 insertions, 1 deletions
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); |