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

testing: Don't use a specific version for the QEMU machine type

Browse Source 
The previously used pc-1.1 is not yet available on e.g. Ubuntu 12.04.
With 'pc' the most current supported version of that type is used.
This commit is contained in:
Tobias Brunner
2013-03-19 11:50:39 +01:00
parent e34666a4ed
commit 9525e9c506
8 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
testing/config/kvm/alice.xml
+1 -1
View File
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>131072</currentMemory> <currentMemory unit='KiB'>131072</currentMemory>
<vcpu placement='static'>1</vcpu> <vcpu placement='static'>1</vcpu>
<os> <os>
<type arch='x86_64' machine='pc-1.1'>hvm</type> <type arch='x86_64' machine='pc'>hvm</type>
<kernel>/var/run/kvm-swan-kernel</kernel> <kernel>/var/run/kvm-swan-kernel</kernel>
<cmdline>root=/dev/vda1 loglevel=1</cmdline> <cmdline>root=/dev/vda1 loglevel=1</cmdline>
<boot dev='hd'/> <boot dev='hd'/>
testing/config/kvm/bob.xml
+1 -1
View File
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>131072</currentMemory> <currentMemory unit='KiB'>131072</currentMemory>
<vcpu placement='static'>1</vcpu> <vcpu placement='static'>1</vcpu>
<os> <os>
<type arch='x86_64' machine='pc-1.1'>hvm</type> <type arch='x86_64' machine='pc'>hvm</type>
<kernel>/var/run/kvm-swan-kernel</kernel> <kernel>/var/run/kvm-swan-kernel</kernel>
<cmdline>root=/dev/vda1 loglevel=1</cmdline> <cmdline>root=/dev/vda1 loglevel=1</cmdline>
<boot dev='hd'/> <boot dev='hd'/>
testing/config/kvm/carol.xml
+1 -1
View File
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>131072</currentMemory> <currentMemory unit='KiB'>131072</currentMemory>
<vcpu placement='static'>1</vcpu> <vcpu placement='static'>1</vcpu>
<os> <os>
<type arch='x86_64' machine='pc-1.1'>hvm</type> <type arch='x86_64' machine='pc'>hvm</type>
<kernel>/var/run/kvm-swan-kernel</kernel> <kernel>/var/run/kvm-swan-kernel</kernel>
<cmdline>root=/dev/vda1 loglevel=1</cmdline> <cmdline>root=/dev/vda1 loglevel=1</cmdline>
<boot dev='hd'/> <boot dev='hd'/>
testing/config/kvm/dave.xml
+1 -1
View File
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>131072</currentMemory> <currentMemory unit='KiB'>131072</currentMemory>
<vcpu placement='static'>1</vcpu> <vcpu placement='static'>1</vcpu>
<os> <os>
<type arch='x86_64' machine='pc-1.1'>hvm</type> <type arch='x86_64' machine='pc'>hvm</type>
<kernel>/var/run/kvm-swan-kernel</kernel> <kernel>/var/run/kvm-swan-kernel</kernel>
<cmdline>root=/dev/vda1 loglevel=1</cmdline> <cmdline>root=/dev/vda1 loglevel=1</cmdline>
<boot dev='hd'/> <boot dev='hd'/>
testing/config/kvm/moon.xml
+1 -1
View File
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>131072</currentMemory> <currentMemory unit='KiB'>131072</currentMemory>
<vcpu placement='static'>1</vcpu> <vcpu placement='static'>1</vcpu>
<os> <os>
<type arch='x86_64' machine='pc-1.1'>hvm</type> <type arch='x86_64' machine='pc'>hvm</type>
<kernel>/var/run/kvm-swan-kernel</kernel> <kernel>/var/run/kvm-swan-kernel</kernel>
<cmdline>root=/dev/vda1 loglevel=1</cmdline> <cmdline>root=/dev/vda1 loglevel=1</cmdline>
<boot dev='hd'/> <boot dev='hd'/>
testing/config/kvm/sun.xml
+1 -1
View File
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>131072</currentMemory> <currentMemory unit='KiB'>131072</currentMemory>
<vcpu placement='static'>1</vcpu> <vcpu placement='static'>1</vcpu>
<os> <os>
<type arch='x86_64' machine='pc-1.1'>hvm</type> <type arch='x86_64' machine='pc'>hvm</type>
<kernel>/var/run/kvm-swan-kernel</kernel> <kernel>/var/run/kvm-swan-kernel</kernel>
<cmdline>root=/dev/vda1 loglevel=1</cmdline> <cmdline>root=/dev/vda1 loglevel=1</cmdline>
<boot dev='hd'/> <boot dev='hd'/>
testing/config/kvm/venus.xml
+1 -1
View File
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>131072</currentMemory> <currentMemory unit='KiB'>131072</currentMemory>
<vcpu placement='static'>1</vcpu> <vcpu placement='static'>1</vcpu>
<os> <os>
<type arch='x86_64' machine='pc-1.1'>hvm</type> <type arch='x86_64' machine='pc'>hvm</type>
<kernel>/var/run/kvm-swan-kernel</kernel> <kernel>/var/run/kvm-swan-kernel</kernel>
<cmdline>root=/dev/vda1 loglevel=1</cmdline> <cmdline>root=/dev/vda1 loglevel=1</cmdline>
<boot dev='hd'/> <boot dev='hd'/>
testing/config/kvm/winnetou.xml
+1 -1
View File
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>131072</currentMemory> <currentMemory unit='KiB'>131072</currentMemory>
<vcpu placement='static'>1</vcpu> <vcpu placement='static'>1</vcpu>
<os> <os>
<type arch='x86_64' machine='pc-1.1'>hvm</type> <type arch='x86_64' machine='pc'>hvm</type>
<kernel>/var/run/kvm-swan-kernel</kernel> <kernel>/var/run/kvm-swan-kernel</kernel>
<cmdline>root=/dev/vda1 loglevel=1</cmdline> <cmdline>root=/dev/vda1 loglevel=1</cmdline>
<boot dev='hd'/> <boot dev='hd'/>