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.
This commit is contained in:
committed by
Tobias Brunner
parent
1eb2d149db
commit
cf6a164108
@@ -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'/>
|
||||
|
||||
@@ -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'/>
|
||||
|
||||
@@ -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'/>
|
||||
|
||||
@@ -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'/>
|
||||
|
||||
@@ -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'/>
|
||||
|
||||
@@ -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'/>
|
||||
|
||||
@@ -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'/>
|
||||
|
||||
@@ -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'/>
|
||||
|
||||
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user