denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

testing: Replace kvm with qemu-system-x86_64

Browse Source 
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:
Noel Kuntze
2021-05-10 11:14:00 +02:00
committed by Tobias Brunner
parent 1eb2d149db
commit cf6a164108
9 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
testing/config/kvm/alice.xml
+1 -1
View File
@@ -21,7 +21,7 @@
<on_reboot>restart</on_reboot> <on_reboot>restart</on_reboot>
<on_crash>restart</on_crash> <on_crash>restart</on_crash>
<devices> <devices>
<emulator>/usr/bin/kvm</emulator> <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='file' device='disk'> <disk type='file' device='disk'>
<driver name='qemu' type='qcow2' cache='writethrough'/> <driver name='qemu' type='qcow2' cache='writethrough'/>
<source file='/var/lib/libvirt/images/alice.qcow2'/> <source file='/var/lib/libvirt/images/alice.qcow2'/>
testing/config/kvm/bob.xml
+1 -1
View File
@@ -21,7 +21,7 @@
<on_reboot>restart</on_reboot> <on_reboot>restart</on_reboot>
<on_crash>restart</on_crash> <on_crash>restart</on_crash>
<devices> <devices>
<emulator>/usr/bin/kvm</emulator> <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='file' device='disk'> <disk type='file' device='disk'>
<driver name='qemu' type='qcow2' cache='writethrough'/> <driver name='qemu' type='qcow2' cache='writethrough'/>
<source file='/var/lib/libvirt/images/bob.qcow2'/> <source file='/var/lib/libvirt/images/bob.qcow2'/>
testing/config/kvm/carol.xml
+1 -1
View File
@@ -21,7 +21,7 @@
<on_reboot>restart</on_reboot> <on_reboot>restart</on_reboot>
<on_crash>restart</on_crash> <on_crash>restart</on_crash>
<devices> <devices>
<emulator>/usr/bin/kvm</emulator> <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='file' device='disk'> <disk type='file' device='disk'>
<driver name='qemu' type='qcow2' cache='writethrough'/> <driver name='qemu' type='qcow2' cache='writethrough'/>
<source file='/var/lib/libvirt/images/carol.qcow2'/> <source file='/var/lib/libvirt/images/carol.qcow2'/>
testing/config/kvm/dave.xml
+1 -1
View File
@@ -21,7 +21,7 @@
<on_reboot>restart</on_reboot> <on_reboot>restart</on_reboot>
<on_crash>restart</on_crash> <on_crash>restart</on_crash>
<devices> <devices>
<emulator>/usr/bin/kvm</emulator> <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='file' device='disk'> <disk type='file' device='disk'>
<driver name='qemu' type='qcow2' cache='writethrough'/> <driver name='qemu' type='qcow2' cache='writethrough'/>
<source file='/var/lib/libvirt/images/dave.qcow2'/> <source file='/var/lib/libvirt/images/dave.qcow2'/>
testing/config/kvm/moon.xml
+1 -1
View File
@@ -21,7 +21,7 @@
<on_reboot>restart</on_reboot> <on_reboot>restart</on_reboot>
<on_crash>restart</on_crash> <on_crash>restart</on_crash>
<devices> <devices>
<emulator>/usr/bin/kvm</emulator> <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='file' device='disk'> <disk type='file' device='disk'>
<driver name='qemu' type='qcow2' cache='writethrough'/> <driver name='qemu' type='qcow2' cache='writethrough'/>
<source file='/var/lib/libvirt/images/moon.qcow2'/> <source file='/var/lib/libvirt/images/moon.qcow2'/>
testing/config/kvm/sun.xml
+1 -1
View File
@@ -21,7 +21,7 @@
<on_reboot>restart</on_reboot> <on_reboot>restart</on_reboot>
<on_crash>restart</on_crash> <on_crash>restart</on_crash>
<devices> <devices>
<emulator>/usr/bin/kvm</emulator> <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='file' device='disk'> <disk type='file' device='disk'>
<driver name='qemu' type='qcow2' cache='writethrough'/> <driver name='qemu' type='qcow2' cache='writethrough'/>
<source file='/var/lib/libvirt/images/sun.qcow2'/> <source file='/var/lib/libvirt/images/sun.qcow2'/>
testing/config/kvm/venus.xml
+1 -1
View File
@@ -21,7 +21,7 @@
<on_reboot>restart</on_reboot> <on_reboot>restart</on_reboot>
<on_crash>restart</on_crash> <on_crash>restart</on_crash>
<devices> <devices>
<emulator>/usr/bin/kvm</emulator> <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='file' device='disk'> <disk type='file' device='disk'>
<driver name='qemu' type='qcow2' cache='writethrough'/> <driver name='qemu' type='qcow2' cache='writethrough'/>
<source file='/var/lib/libvirt/images/venus.qcow2'/> <source file='/var/lib/libvirt/images/venus.qcow2'/>
testing/config/kvm/winnetou.xml
+1 -1
View File
@@ -21,7 +21,7 @@
<on_reboot>restart</on_reboot> <on_reboot>restart</on_reboot>
<on_crash>restart</on_crash> <on_crash>restart</on_crash>
<devices> <devices>
<emulator>/usr/bin/kvm</emulator> <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='file' device='disk'> <disk type='file' device='disk'>
<driver name='qemu' type='qcow2' cache='writethrough'/> <driver name='qemu' type='qcow2' cache='writethrough'/>
<source file='/var/lib/libvirt/images/winnetou.qcow2'/> <source file='/var/lib/libvirt/images/winnetou.qcow2'/>
testing/start-testing
+1 -1
View File
@@ -17,7 +17,7 @@ echo "Starting test environment"
[ `id -u` -eq 0 ] || die "You must be root to run $0" [ `id -u` -eq 0 ] || die "You must be root to run $0"
running_any $STRONGSWANHOSTS && die "Please stop test environment before running $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" [ -f $KNLSRC ] || die "Kernel $KNLSRC not found"
log_action "Deploying kernel $KERNEL" log_action "Deploying kernel $KERNEL"