[libvirt] [PATCH] aarch64: Support versioned machine types.

[Daniel P. Berrange]

On Fri, Jan 23, 2015 at 09:53:13AM -0500, Richard W.M. Jones wrote:
> From: "Richard W.M. Jones" <rjones at redhat.com>
> 
> 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.

Not just distros - qemu upstream will need to use versioned machine
type for arm eventually too.

> Signed-off-by: Richard W.M. Jones <rjones at redhat.com>
> ---
>  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 434ac7c..3c75de5 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);

ACK


Regards,
Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|