Virtualization is not available in Aarch64 KVM - enable in all other cases

common.xml

@@ -40,6 +40,11 @@
   <arg value="if [ -c /dev/kvm ] &amp;&amp; [ `uname -m` = 'aarch64' ] ; then echo -n '-enable-kvm' ; fi"/>
  </exec>
 
+ <exec executable="bash" outputproperty="VIRTUALIZATION_AARCH64">
+  <arg value="-c"/>
+  <arg value="if [ ! -c /dev/kvm ] &amp;&amp; [ `uname -m` = 'aarch64' ] ; then echo -n '-M virtualization=true' ; fi"/>
+ </exec>
+
  <target name="copy-to-secondary">
   <exec executable="cp" dir="${builddir}" failonerror="true">
    <arg line="disk.img secondary.img"/>
@@ -221,14 +226,14 @@
  <target name="run-system-armv8">
   <exec executable="qemu-system-aarch64">
    <env key="QEMU_AUDIO_DRV" value="none"/>
-   <arg line=" -kernel ${builddir}/boot/vmlinuz -cpu cortex-a53 ${ENABLE_KVM_AARCH64} -m 1024 -M virt,virtualization=true -no-reboot -append &quot;console=${CONSOLE} root=/dev/${DISK}2 rootwait panic=1 rootfstype=ext4 rootflags=discard rw systemd.unit=rescue.target net.ifnames=0&quot; -device sdhci-pci -drive format=raw,file=${builddir}/disk.img,if=none,id=disk,cache=writeback,discard=unmap -device sd-card,drive=disk -device virtio-rng-pci -nographic"/>
+   <arg line=" -kernel ${builddir}/boot/vmlinuz -cpu cortex-a53 ${ENABLE_KVM_AARCH64} -m 1024 -M virt ${VIRTUALIZATION_AARCH64} -no-reboot -append &quot;console=${CONSOLE} root=/dev/${DISK}2 rootwait panic=1 rootfstype=ext4 rootflags=discard rw systemd.unit=rescue.target net.ifnames=0&quot; -device sdhci-pci -drive format=raw,file=${builddir}/disk.img,if=none,id=disk,cache=writeback,discard=unmap -device sd-card,drive=disk -device virtio-rng-pci -nographic"/>
   </exec>
  </target>
 
  <target name="run-system-with-secondary-armv8">
   <exec executable="qemu-system-aarch64">
    <env key="QEMU_AUDIO_DRV" value="none"/>
-   <arg line=" -kernel ${builddir}/boot/vmlinuz -cpu cortex-a53 ${ENABLE_KVM_AARCH64} -m 1024 -M virt,virtualization=true -no-reboot -append &quot;console=${CONSOLE} root=/dev/${DISK}2 rootwait panic=1 rootfstype=ext4 rootflags=discard rw systemd.unit=rescue.target net.ifnames=0&quot; -device sdhci-pci -drive format=raw,file=${builddir}/disk.img,if=none,id=disk,cache=writeback,discard=unmap -device sd-card,drive=disk -device sdhci-pci -drive format=raw,file=${builddir}/secondary.img,if=none,id=secondary,cache=writeback,discard=unmap -device sd-card,drive=secondary -device virtio-rng-pci -nographic"/>
+   <arg line=" -kernel ${builddir}/boot/vmlinuz -cpu cortex-a53 ${ENABLE_KVM_AARCH64} -m 1024 -M virt ${VIRTUALIZATION_AARCH64} -no-reboot -append &quot;console=${CONSOLE} root=/dev/${DISK}2 rootwait panic=1 rootfstype=ext4 rootflags=discard rw systemd.unit=rescue.target net.ifnames=0&quot; -device sdhci-pci -drive format=raw,file=${builddir}/disk.img,if=none,id=disk,cache=writeback,discard=unmap -device sd-card,drive=disk -device sdhci-pci -drive format=raw,file=${builddir}/secondary.img,if=none,id=secondary,cache=writeback,discard=unmap -device sd-card,drive=secondary -device virtio-rng-pci -nographic"/>
   </exec>
  </target>