testing: Replace kvm with qemu-system-x86_64

It might not exist on all platforms and according to the man page:

  The kvm wrapper script is used to provide compatibility with old
  qemu-kvm package which has been merged into qemu as of version 1.3.

  The script executes
    qemu-system-x86_64 -enable-kvm
  passing all other command-line arguments to the qemu binary.

Closes strongswan/strongswan#385.

diff --git a/testing/config/kvm/alice.xml b/testing/config/kvm/alice.xml
index 3eb2a99a9d3fa948cf72658e906ee7fd4161b8aa..de8f5ab0050820566062cc5d0d74adff32693295 100644 (file)
--- a/testing/config/kvm/alice.xml
+++ b/testing/config/kvm/alice.xml
@@ -21,7 +21,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
-    <emulator>/usr/bin/kvm</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type='file' device='disk'>
       <driver name='qemu' type='qcow2' cache='writethrough'/>
       <source file='/var/lib/libvirt/images/alice.qcow2'/>

diff --git a/testing/config/kvm/bob.xml b/testing/config/kvm/bob.xml
index 90acb7fb14563e6534324f979f98a45b4074a1bc..0854d10d5d3095f040b88fc911875fc6538aadcf 100644 (file)
--- a/testing/config/kvm/bob.xml
+++ b/testing/config/kvm/bob.xml
@@ -21,7 +21,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
-    <emulator>/usr/bin/kvm</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type='file' device='disk'>
       <driver name='qemu' type='qcow2' cache='writethrough'/>
       <source file='/var/lib/libvirt/images/bob.qcow2'/>

diff --git a/testing/config/kvm/carol.xml b/testing/config/kvm/carol.xml
index 96f23dfe22db28a9bbde6219c929150759b83cb2..4d1a47e355e663adbea48ffb9224a5e8fc5850af 100644 (file)
--- a/testing/config/kvm/carol.xml
+++ b/testing/config/kvm/carol.xml
@@ -21,7 +21,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
-    <emulator>/usr/bin/kvm</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type='file' device='disk'>
       <driver name='qemu' type='qcow2' cache='writethrough'/>
       <source file='/var/lib/libvirt/images/carol.qcow2'/>

diff --git a/testing/config/kvm/dave.xml b/testing/config/kvm/dave.xml
index 369514dbac2726caf389b7fff0c1c81f9e87e160..fb292944ed597173e46c312711b4e1294e596b90 100644 (file)
--- a/testing/config/kvm/dave.xml
+++ b/testing/config/kvm/dave.xml
@@ -21,7 +21,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
-    <emulator>/usr/bin/kvm</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type='file' device='disk'>
       <driver name='qemu' type='qcow2' cache='writethrough'/>
       <source file='/var/lib/libvirt/images/dave.qcow2'/>

diff --git a/testing/config/kvm/moon.xml b/testing/config/kvm/moon.xml
index 398e36f6c1ff5378909b8f8b4a2b53c427bd5338..0fd3dd98f1c9f8117d4ec15a9f4b62a0ce14ca85 100644 (file)
--- a/testing/config/kvm/moon.xml
+++ b/testing/config/kvm/moon.xml
@@ -21,7 +21,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
-    <emulator>/usr/bin/kvm</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type='file' device='disk'>
       <driver name='qemu' type='qcow2' cache='writethrough'/>
       <source file='/var/lib/libvirt/images/moon.qcow2'/>

diff --git a/testing/config/kvm/sun.xml b/testing/config/kvm/sun.xml
index f77839ad0a7abad4541b672b461c2419cf9d7eb2..55f2d110ecc6ca97102f38ae0ee589ab35e7ec7e 100644 (file)
--- a/testing/config/kvm/sun.xml
+++ b/testing/config/kvm/sun.xml
@@ -21,7 +21,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
-    <emulator>/usr/bin/kvm</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type='file' device='disk'>
       <driver name='qemu' type='qcow2' cache='writethrough'/>
       <source file='/var/lib/libvirt/images/sun.qcow2'/>

diff --git a/testing/config/kvm/venus.xml b/testing/config/kvm/venus.xml
index aa15705c61bfc5113aed083f92deebc854a6ffea..c01c410ce12e459883c0fc19e6cc9e6d49992b2c 100644 (file)
--- a/testing/config/kvm/venus.xml
+++ b/testing/config/kvm/venus.xml
@@ -21,7 +21,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
-    <emulator>/usr/bin/kvm</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type='file' device='disk'>
       <driver name='qemu' type='qcow2' cache='writethrough'/>
       <source file='/var/lib/libvirt/images/venus.qcow2'/>

diff --git a/testing/config/kvm/winnetou.xml b/testing/config/kvm/winnetou.xml
index 7ada13180ba021292d516878431aa09abf70c6a3..93e13120b9df33f00c8f03897b02fb74fc79f172 100644 (file)
--- a/testing/config/kvm/winnetou.xml
+++ b/testing/config/kvm/winnetou.xml
@@ -21,7 +21,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
-    <emulator>/usr/bin/kvm</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type='file' device='disk'>
       <driver name='qemu' type='qcow2' cache='writethrough'/>
       <source file='/var/lib/libvirt/images/winnetou.qcow2'/>

diff --git a/testing/start-testing b/testing/start-testing
index 7ef35f9e49955a1c8a571cfa2533f8c2cbf67702..602d25293479af6d64048d001fcd89cd974a8220 100755 (executable)
--- a/testing/start-testing
+++ b/testing/start-testing
@@ -17,7 +17,7 @@ echo "Starting test environment"
 [ `id -u` -eq 0 ] || die "You must be root to run $0"
 running_any $STRONGSWANHOSTS && die "Please stop test environment before running $0"
 
-check_commands kvm virsh
+check_commands virsh qemu-system-x86_64
 
 [ -f $KNLSRC ] || die "Kernel $KNLSRC not found"
 log_action "Deploying kernel $KERNEL"