Changed KVM detection to platform independent method

common.xml

@@ -25,9 +25,9 @@
  <property name="BUILD_OPTIONS" value="${env.BUILD_OPTIONS}" if:set="env.BUILD_OPTIONS"/>
  <property name="BUILD_OPTIONS" value="" unless:set="env.BUILD_OPTIONS"/>
 
- <exec executable="bash" outputproperty="ENABLE_KVM_X86">
+ <exec executable="bash" outputproperty="ENABLE_KVM">
   <arg value="-c"/>
-  <arg value="if [ `lsmod | grep -c -E '(kvm_intel|kvm_amd)'` -gt 0 ] ; then echo -n '-enable-kvm' ; fi"/>
+  <arg value="if [ -c /dev/kvm ] ; then echo -n '-enable-kvm' ; fi"/>
  </exec>
 
  <target name="copy-to-secondary">
@@ -197,168 +197,168 @@
  <target name="run-system-armv7">
   <exec executable="qemu-system-arm">
    <env key="QEMU_AUDIO_DRV" value="none"/>
-   <arg line=" -kernel ${builddir}/boot/vmlinuz -cpu cortex-a15 -m 1024 -M virt,highmem=off -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-a15 ${ENABLE_KVM} -m 1024 -M virt,highmem=off -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-armv7">
   <exec executable="qemu-system-arm">
    <env key="QEMU_AUDIO_DRV" value="none"/>
-   <arg line=" -kernel ${builddir}/boot/vmlinuz -cpu cortex-a15 -m 1024 -M virt,highmem=off -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-a15 ${ENABLE_KVM} -m 1024 -M virt,highmem=off -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>
 
  <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-a57 -m 1024 -M virt -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-a57 ${ENABLE_KVM} -m 1024 -M virt -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-a57 -m 1024 -M virt -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-a57 ${ENABLE_KVM} -m 1024 -M virt -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>
 
  <target name="run-system-x86_64">
   <exec executable="qemu-system-x86_64">
    <env key="QEMU_AUDIO_DRV" value="none"/>
-   <arg line=" -kernel ${builddir}/boot/vmlinuz -cpu kvm64 ${ENABLE_KVM_X86} -m 1024 -M pc -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 virtio-scsi-pci -drive format=raw,file=${builddir}/disk.img,if=none,id=disk,cache=writeback,discard=unmap -device scsi-hd,drive=disk -device virtio-rng-pci -nographic"/>
+   <arg line=" -kernel ${builddir}/boot/vmlinuz -cpu kvm64 ${ENABLE_KVM} -m 1024 -M pc -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 virtio-scsi-pci -drive format=raw,file=${builddir}/disk.img,if=none,id=disk,cache=writeback,discard=unmap -device scsi-hd,drive=disk -device virtio-rng-pci -nographic"/>
   </exec>
  </target>
 
  <target name="run-system-with-secondary-x86_64">
   <exec executable="qemu-system-x86_64">
    <env key="QEMU_AUDIO_DRV" value="none"/>
-   <arg line=" -kernel ${builddir}/boot/vmlinuz -cpu kvm64 ${ENABLE_KVM_X86} -m 1024 -M pc -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 virtio-scsi-pci -drive format=raw,file=${builddir}/disk.img,if=none,id=disk,cache=writeback,discard=unmap -device scsi-hd,drive=disk -device virtio-scsi-pci -drive format=raw,file=${builddir}/secondary.img,if=none,id=secondary,cache=writeback,discard=unmap -device scsi-hd,drive=secondary -device virtio-rng-pci -nographic"/>
+   <arg line=" -kernel ${builddir}/boot/vmlinuz -cpu kvm64 ${ENABLE_KVM} -m 1024 -M pc -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 virtio-scsi-pci -drive format=raw,file=${builddir}/disk.img,if=none,id=disk,cache=writeback,discard=unmap -device scsi-hd,drive=disk -device virtio-scsi-pci -drive format=raw,file=${builddir}/secondary.img,if=none,id=secondary,cache=writeback,discard=unmap -device scsi-hd,drive=secondary -device virtio-rng-pci -nographic"/>
   </exec>
  </target>
 
  <target name="run-system-core2duo">
   <exec executable="qemu-system-x86_64">
    <env key="QEMU_AUDIO_DRV" value="none"/>
-   <arg line=" -kernel ${builddir}/boot/vmlinuz -cpu core2duo ${ENABLE_KVM_X86} -m 1024 -M pc -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 virtio-scsi-pci -drive format=raw,file=${builddir}/disk.img,if=none,id=disk,cache=writeback,discard=unmap -device scsi-hd,drive=disk -device virtio-rng-pci -nographic"/>
+   <arg line=" -kernel ${builddir}/boot/vmlinuz -cpu core2duo ${ENABLE_KVM} -m 1024 -M pc -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 virtio-scsi-pci -drive format=raw,file=${builddir}/disk.img,if=none,id=disk,cache=writeback,discard=unmap -device scsi-hd,drive=disk -device virtio-rng-pci -nographic"/>
   </exec>
  </target>
 
  <target name="run-system-with-secondary-core2duo">
   <exec executable="qemu-system-x86_64">
    <env key="QEMU_AUDIO_DRV" value="none"/>
-   <arg line=" -kernel ${builddir}/boot/vmlinuz -cpu core2duo ${ENABLE_KVM_X86} -m 1024 -M pc -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 virtio-scsi-pci -drive format=raw,file=${builddir}/disk.img,if=none,id=disk,cache=writeback,discard=unmap -device scsi-hd,drive=disk -device virtio-scsi-pci -drive format=raw,file=${builddir}/secondary.img,if=none,id=secondary,cache=writeback,discard=unmap -device scsi-hd,drive=secondary -device virtio-rng-pci -nographic"/>
+   <arg line=" -kernel ${builddir}/boot/vmlinuz -cpu core2duo ${ENABLE_KVM} -m 1024 -M pc -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 virtio-scsi-pci -drive format=raw,file=${builddir}/disk.img,if=none,id=disk,cache=writeback,discard=unmap -device scsi-hd,drive=disk -device virtio-scsi-pci -drive format=raw,file=${builddir}/secondary.img,if=none,id=secondary,cache=writeback,discard=unmap -device scsi-hd,drive=secondary -device virtio-rng-pci -nographic"/>
   </exec>
  </target>
 
  <target name="run-system-nehalem">
   <exec executable="qemu-system-x86_64">
    <env key="QEMU_AUDIO_DRV" value="none"/>
-   <arg line=" -kernel ${builddir}/boot/vmlinuz -cpu Nehalem ${ENABLE_KVM_X86} -m 1024 -M pc -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 virtio-scsi-pci -drive format=raw,file=${builddir}/disk.img,if=none,id=disk,cache=writeback,discard=unmap -device scsi-hd,drive=disk -device virtio-rng-pci -nographic"/>
+   <arg line=" -kernel ${builddir}/boot/vmlinuz -cpu Nehalem ${ENABLE_KVM} -m 1024 -M pc -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 virtio-scsi-pci -drive format=raw,file=${builddir}/disk.img,if=none,id=disk,cache=writeback,discard=unmap -device scsi-hd,drive=disk -device virtio-rng-pci -nographic"/>
   </exec>
  </target>
 
  <target name="run-system-with-secondary-nehalem">
   <exec executable="qemu-system-x86_64">
    <env key="QEMU_AUDIO_DRV" value="none"/>
-   <arg line=" -kernel ${builddir}/boot/vmlinuz -cpu Nehalem ${ENABLE_KVM_X86} -m 1024 -M pc -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 virtio-scsi-pci -drive format=raw,file=${builddir}/disk.img,if=none,id=disk,cache=writeback,discard=unmap -device scsi-hd,drive=disk -device virtio-scsi-pci -drive format=raw,file=${builddir}/secondary.img,if=none,id=secondary,cache=writeback,discard=unmap -device scsi-hd,drive=secondary -device virtio-rng-pci -nographic"/>
+   <arg line=" -kernel ${builddir}/boot/vmlinuz -cpu Nehalem ${ENABLE_KVM} -m 1024 -M pc -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 virtio-scsi-pci -drive format=raw,file=${builddir}/disk.img,if=none,id=disk,cache=writeback,discard=unmap -device scsi-hd,drive=disk -device virtio-scsi-pci -drive format=raw,file=${builddir}/secondary.img,if=none,id=secondary,cache=writeback,discard=unmap -device scsi-hd,drive=secondary -device virtio-rng-pci -nographic"/>
   </exec>
  </target>
 
  <target name="run-system-westmere">
   <exec executable="qemu-system-x86_64">
    <env key="QEMU_AUDIO_DRV" value="none"/>
-   <arg line=" -kernel ${builddir}/boot/vmlinuz -cpu Westmere ${ENABLE_KVM_X86} -m 1024 -M pc -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 virtio-scsi-pci -drive format=raw,file=${builddir}/disk.img,if=none,id=disk,cache=writeback,discard=unmap -device scsi-hd,drive=disk -device virtio-rng-pci -nographic"/>
+   <arg line=" -kernel ${builddir}/boot/vmlinuz -cpu Westmere ${ENABLE_KVM} -m 1024 -M pc -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 virtio-scsi-pci -drive format=raw,file=${builddir}/disk.img,if=none,id=disk,cache=writeback,discard=unmap -device scsi-hd,drive=disk -device virtio-rng-pci -nographic"/>
   </exec>
  </target>
 
  <target name="run-system-with-secondary-westmere">
   <exec executable="qemu-system-x86_64">
    <env key="QEMU_AUDIO_DRV" value="none"/>
-   <arg line=" -kernel ${builddir}/boot/vmlinuz -cpu Westmere ${ENABLE_KVM_X86} -m 1024 -M pc -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 virtio-scsi-pci -drive format=raw,file=${builddir}/disk.img,if=none,id=disk,cache=writeback,discard=unmap -device scsi-hd,drive=disk -device virtio-scsi-pci -drive format=raw,file=${builddir}/secondary.img,if=none,id=secondary,cache=writeback,discard=unmap -device scsi-hd,drive=secondary -device virtio-rng-pci -nographic"/>
+   <arg line=" -kernel ${builddir}/boot/vmlinuz -cpu Westmere ${ENABLE_KVM} -m 1024 -M pc -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 virtio-scsi-pci -drive format=raw,file=${builddir}/disk.img,if=none,id=disk,cache=writeback,discard=unmap -device scsi-hd,drive=disk -device virtio-scsi-pci -drive format=raw,file=${builddir}/secondary.img,if=none,id=secondary,cache=writeback,discard=unmap -device scsi-hd,drive=secondary -device virtio-rng-pci -nographic"/>
   </exec>
  </target>
 
  <target name="run-system-sandybridge">
   <exec executable="qemu-system-x86_64">
    <env key="QEMU_AUDIO_DRV" value="none"/>
-   <arg line=" -kernel ${builddir}/boot/vmlinuz -cpu SandyBridge ${ENABLE_KVM_X86} -m 1024 -M pc -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 virtio-scsi-pci -drive format=raw,file=${builddir}/disk.img,if=none,id=disk,cache=writeback,discard=unmap -device scsi-hd,drive=disk -device virtio-rng-pci -nographic"/>
+   <arg line=" -kernel ${builddir}/boot/vmlinuz -cpu SandyBridge ${ENABLE_KVM} -m 1024 -M pc -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 virtio-scsi-pci -drive format=raw,file=${builddir}/disk.img,if=none,id=disk,cache=writeback,discard=unmap -device scsi-hd,drive=disk -device virtio-rng-pci -nographic"/>
   </exec>
  </target>
 
  <target name="run-system-with-secondary-sandybridge">
   <exec executable="qemu-system-x86_64">
    <env key="QEMU_AUDIO_DRV" value="none"/>
-   <arg line=" -kernel ${builddir}/boot/vmlinuz -cpu SandyBridge ${ENABLE_KVM_X86} -m 1024 -M pc -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 virtio-scsi-pci -drive format=raw,file=${builddir}/disk.img,if=none,id=disk,cache=writeback,discard=unmap -device scsi-hd,drive=disk -device virtio-scsi-pci -drive format=raw,file=${builddir}/secondary.img,if=none,id=secondary,cache=writeback,discard=unmap -device scsi-hd,drive=secondary -device virtio-rng-pci -nographic"/>
+   <arg line=" -kernel ${builddir}/boot/vmlinuz -cpu SandyBridge ${ENABLE_KVM} -m 1024 -M pc -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 virtio-scsi-pci -drive format=raw,file=${builddir}/disk.img,if=none,id=disk,cache=writeback,discard=unmap -device scsi-hd,drive=disk -device virtio-scsi-pci -drive format=raw,file=${builddir}/secondary.img,if=none,id=secondary,cache=writeback,discard=unmap -device scsi-hd,drive=secondary -device virtio-rng-pci -nographic"/>
   </exec>
  </target>
 
  <target name="run-system-ivybridge">
   <exec executable="qemu-system-x86_64">
    <env key="QEMU_AUDIO_DRV" value="none"/>
-   <arg line=" -kernel ${builddir}/boot/vmlinuz -cpu IvyBridge ${ENABLE_KVM_X86} -m 1024 -M pc -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 virtio-scsi-pci -drive format=raw,file=${builddir}/disk.img,if=none,id=disk,cache=writeback,discard=unmap -device scsi-hd,drive=disk -device virtio-rng-pci -nographic"/>
+   <arg line=" -kernel ${builddir}/boot/vmlinuz -cpu IvyBridge ${ENABLE_KVM} -m 1024 -M pc -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 virtio-scsi-pci -drive format=raw,file=${builddir}/disk.img,if=none,id=disk,cache=writeback,discard=unmap -device scsi-hd,drive=disk -device virtio-rng-pci -nographic"/>
   </exec>
  </target>
 
  <target name="run-system-with-secondary-ivybridge">
   <exec executable="qemu-system-x86_64">
    <env key="QEMU_AUDIO_DRV" value="none"/>
-   <arg line=" -kernel ${builddir}/boot/vmlinuz -cpu IvyBridge ${ENABLE_KVM_X86} -m 1024 -M pc -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 virtio-scsi-pci -drive format=raw,file=${builddir}/disk.img,if=none,id=disk,cache=writeback,discard=unmap -device scsi-hd,drive=disk -device virtio-scsi-pci -drive format=raw,file=${builddir}/secondary.img,if=none,id=secondary,cache=writeback,discard=unmap -device scsi-hd,drive=secondary -device virtio-rng-pci -nographic"/>
+   <arg line=" -kernel ${builddir}/boot/vmlinuz -cpu IvyBridge ${ENABLE_KVM} -m 1024 -M pc -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 virtio-scsi-pci -drive format=raw,file=${builddir}/disk.img,if=none,id=disk,cache=writeback,discard=unmap -device scsi-hd,drive=disk -device virtio-scsi-pci -drive format=raw,file=${builddir}/secondary.img,if=none,id=secondary,cache=writeback,discard=unmap -device scsi-hd,drive=secondary -device virtio-rng-pci -nographic"/>
   </exec>
  </target>
 
  <target name="run-system-haswell">
   <exec executable="qemu-system-x86_64">
    <env key="QEMU_AUDIO_DRV" value="none"/>
-   <arg line=" -kernel ${builddir}/boot/vmlinuz -cpu Haswell ${ENABLE_KVM_X86} -m 1024 -M pc -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 virtio-scsi-pci -drive format=raw,file=${builddir}/disk.img,if=none,id=disk,cache=writeback,discard=unmap -device scsi-hd,drive=disk -device virtio-rng-pci -nographic"/>
+   <arg line=" -kernel ${builddir}/boot/vmlinuz -cpu Haswell ${ENABLE_KVM} -m 1024 -M pc -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 virtio-scsi-pci -drive format=raw,file=${builddir}/disk.img,if=none,id=disk,cache=writeback,discard=unmap -device scsi-hd,drive=disk -device virtio-rng-pci -nographic"/>
   </exec>
  </target>
 
  <target name="run-system-with-secondary-haswell">
   <exec executable="qemu-system-x86_64">
    <env key="QEMU_AUDIO_DRV" value="none"/>
-   <arg line=" -kernel ${builddir}/boot/vmlinuz -cpu Haswell ${ENABLE_KVM_X86} -m 1024 -M pc -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 virtio-scsi-pci -drive format=raw,file=${builddir}/disk.img,if=none,id=disk,cache=writeback,discard=unmap -device scsi-hd,drive=disk -device virtio-scsi-pci -drive format=raw,file=${builddir}/secondary.img,if=none,id=secondary,cache=writeback,discard=unmap -device scsi-hd,drive=secondary -device virtio-rng-pci -nographic"/>
+   <arg line=" -kernel ${builddir}/boot/vmlinuz -cpu Haswell ${ENABLE_KVM} -m 1024 -M pc -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 virtio-scsi-pci -drive format=raw,file=${builddir}/disk.img,if=none,id=disk,cache=writeback,discard=unmap -device scsi-hd,drive=disk -device virtio-scsi-pci -drive format=raw,file=${builddir}/secondary.img,if=none,id=secondary,cache=writeback,discard=unmap -device scsi-hd,drive=secondary -device virtio-rng-pci -nographic"/>
   </exec>
  </target>
 
  <target name="run-system-skylake-client">
   <exec executable="qemu-system-x86_64">
    <env key="QEMU_AUDIO_DRV" value="none"/>
-   <arg line=" -kernel ${builddir}/boot/vmlinuz -cpu Skylake-Client ${ENABLE_KVM_X86} -m 1024 -M pc -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 virtio-scsi-pci -drive format=raw,file=${builddir}/disk.img,if=none,id=disk,cache=writeback,discard=unmap -device scsi-hd,drive=disk -device virtio-rng-pci -nographic"/>
+   <arg line=" -kernel ${builddir}/boot/vmlinuz -cpu Skylake-Client ${ENABLE_KVM} -m 1024 -M pc -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 virtio-scsi-pci -drive format=raw,file=${builddir}/disk.img,if=none,id=disk,cache=writeback,discard=unmap -device scsi-hd,drive=disk -device virtio-rng-pci -nographic"/>
   </exec>
  </target>
 
  <target name="run-system-with-secondary-skylake-client">
   <exec executable="qemu-system-x86_64">
    <env key="QEMU_AUDIO_DRV" value="none"/>
-   <arg line=" -kernel ${builddir}/boot/vmlinuz -cpu Skylake-Client ${ENABLE_KVM_X86} -m 1024 -M pc -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 virtio-scsi-pci -drive format=raw,file=${builddir}/disk.img,if=none,id=disk,cache=writeback,discard=unmap -device scsi-hd,drive=disk -device virtio-scsi-pci -drive format=raw,file=${builddir}/secondary.img,if=none,id=secondary,cache=writeback,discard=unmap -device scsi-hd,drive=secondary -device virtio-rng-pci -nographic"/>
+   <arg line=" -kernel ${builddir}/boot/vmlinuz -cpu Skylake-Client ${ENABLE_KVM} -m 1024 -M pc -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 virtio-scsi-pci -drive format=raw,file=${builddir}/disk.img,if=none,id=disk,cache=writeback,discard=unmap -device scsi-hd,drive=disk -device virtio-scsi-pci -drive format=raw,file=${builddir}/secondary.img,if=none,id=secondary,cache=writeback,discard=unmap -device scsi-hd,drive=secondary -device virtio-rng-pci -nographic"/>
   </exec>
  </target>
 
  <target name="run-system-phenom">
   <exec executable="qemu-system-x86_64">
    <env key="QEMU_AUDIO_DRV" value="none"/>
-   <arg line=" -kernel ${builddir}/boot/vmlinuz -cpu phenom -m 1024 -M pc -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 virtio-scsi-pci -drive format=raw,file=${builddir}/disk.img,if=none,id=disk,cache=writeback,discard=unmap -device scsi-hd,drive=disk -device virtio-rng-pci -nographic"/>
+   <arg line=" -kernel ${builddir}/boot/vmlinuz -cpu phenom ${ENABLE_KVM} -m 1024 -M pc -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 virtio-scsi-pci -drive format=raw,file=${builddir}/disk.img,if=none,id=disk,cache=writeback,discard=unmap -device scsi-hd,drive=disk -device virtio-rng-pci -nographic"/>
   </exec>
  </target>
 
  <target name="run-system-with-secondary-phenom">
   <exec executable="qemu-system-x86_64">
    <env key="QEMU_AUDIO_DRV" value="none"/>
-   <arg line=" -kernel ${builddir}/boot/vmlinuz -cpu phenom -m 1024 -M pc -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 virtio-scsi-pci -drive format=raw,file=${builddir}/disk.img,if=none,id=disk,cache=writeback,discard=unmap -device scsi-hd,drive=disk -device virtio-scsi-pci -drive format=raw,file=${builddir}/secondary.img,if=none,id=secondary,cache=writeback,discard=unmap -device scsi-hd,drive=secondary -device virtio-rng-pci -nographic"/>
+   <arg line=" -kernel ${builddir}/boot/vmlinuz -cpu phenom ${ENABLE_KVM} -m 1024 -M pc -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 virtio-scsi-pci -drive format=raw,file=${builddir}/disk.img,if=none,id=disk,cache=writeback,discard=unmap -device scsi-hd,drive=disk -device virtio-scsi-pci -drive format=raw,file=${builddir}/secondary.img,if=none,id=secondary,cache=writeback,discard=unmap -device scsi-hd,drive=secondary -device virtio-rng-pci -nographic"/>
   </exec>
  </target>
 
  <target name="run-system-opteron-g4">
   <exec executable="qemu-system-x86_64">
    <env key="QEMU_AUDIO_DRV" value="none"/>
-   <arg line=" -kernel ${builddir}/boot/vmlinuz -cpu Opteron_G4 ${ENABLE_KVM_X86} -m 1024 -M pc -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 virtio-scsi-pci -drive format=raw,file=${builddir}/disk.img,if=none,id=disk,cache=writeback,discard=unmap -device scsi-hd,drive=disk -device virtio-rng-pci -nographic"/>
+   <arg line=" -kernel ${builddir}/boot/vmlinuz -cpu Opteron_G4 ${ENABLE_KVM} -m 1024 -M pc -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 virtio-scsi-pci -drive format=raw,file=${builddir}/disk.img,if=none,id=disk,cache=writeback,discard=unmap -device scsi-hd,drive=disk -device virtio-rng-pci -nographic"/>
   </exec>
  </target>
 
  <target name="run-system-with-secondary-opteron-g4">
   <exec executable="qemu-system-x86_64">
    <env key="QEMU_AUDIO_DRV" value="none"/>
-   <arg line=" -kernel ${builddir}/boot/vmlinuz -cpu Opteron_G4 ${ENABLE_KVM_X86} -m 1024 -M pc -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 virtio-scsi-pci -drive format=raw,file=${builddir}/disk.img,if=none,id=disk,cache=writeback,discard=unmap -device scsi-hd,drive=disk -device virtio-scsi-pci -drive format=raw,file=${builddir}/secondary.img,if=none,id=secondary,cache=writeback,discard=unmap -device scsi-hd,drive=secondary -device virtio-rng-pci -nographic"/>
+   <arg line=" -kernel ${builddir}/boot/vmlinuz -cpu Opteron_G4 ${ENABLE_KVM} -m 1024 -M pc -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 virtio-scsi-pci -drive format=raw,file=${builddir}/disk.img,if=none,id=disk,cache=writeback,discard=unmap -device scsi-hd,drive=disk -device virtio-scsi-pci -drive format=raw,file=${builddir}/secondary.img,if=none,id=secondary,cache=writeback,discard=unmap -device scsi-hd,drive=secondary -device virtio-rng-pci -nographic"/>
   </exec>
  </target>