Commit d757a79e authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev

We should use -cpu host if KVM is enabled on aarch64 as it lacks ability to...

We should use -cpu host if KVM is enabled on aarch64 as it lacks ability to mimic other CPUs without full emulation
parent 33403473
......@@ -40,6 +40,11 @@
<arg value="if [ ! -c /dev/kvm ] &amp;&amp; [ `uname -m` = 'armv7l' ] ; then echo -n '-M virtualization=true' ; fi"/>
</exec>
<exec executable="bash" outputproperty="CPU_AARCH64">
<arg value="-c"/>
<arg value="if [ -c /dev/kvm ] &amp;&amp; [ `uname -m` = 'aarch64' ] ; then echo -n 'host' ; else echo -n 'cortex-a53' ; fi"/>
</exec>
<exec executable="bash" outputproperty="ENABLE_KVM_AARCH64">
<arg value="-c"/>
<arg value="if [ -c /dev/kvm ] &amp;&amp; [ `uname -m` = 'aarch64' ] ; then echo -n '-enable-kvm' ; fi"/>
......@@ -223,14 +228,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_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"/>
<arg line=" -kernel ${builddir}/boot/vmlinuz -cpu ${CPU_AARCH64} ${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_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"/>
<arg line=" -kernel ${builddir}/boot/vmlinuz -cpu ${CPU_AARCH64} ${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>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment