diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2013-03-08 14:18:54 +0100 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2013-03-19 11:50:39 +0100 |
| commit | 9525e9c506fc30457a396838ab8ef801e23c79dd (patch) | |
| tree | 39a9b791aee046158b39b85b59022223edaea97b /testing/config | |
| parent | e34666a4ed4355b1437c17c04ff7bef2bac549e0 (diff) | |
| download | strongswan-9525e9c506fc30457a396838ab8ef801e23c79dd.tar.bz2 strongswan-9525e9c506fc30457a396838ab8ef801e23c79dd.tar.xz | |
testing: Don't use a specific version for the QEMU machine type
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.
Diffstat (limited to 'testing/config')
| -rw-r--r-- | testing/config/kvm/alice.xml | 2 | ||||
| -rw-r--r-- | testing/config/kvm/bob.xml | 2 | ||||
| -rw-r--r-- | testing/config/kvm/carol.xml | 2 | ||||
| -rw-r--r-- | testing/config/kvm/dave.xml | 2 | ||||
| -rw-r--r-- | testing/config/kvm/moon.xml | 2 | ||||
| -rw-r--r-- | testing/config/kvm/sun.xml | 2 | ||||
| -rw-r--r-- | testing/config/kvm/venus.xml | 2 | ||||
| -rw-r--r-- | testing/config/kvm/winnetou.xml | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/testing/config/kvm/alice.xml b/testing/config/kvm/alice.xml index 6ca78f861..87a960003 100644 --- a/testing/config/kvm/alice.xml +++ b/testing/config/kvm/alice.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>131072</currentMemory> <vcpu placement='static'>1</vcpu> <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> <cmdline>root=/dev/vda1 loglevel=1</cmdline> <boot dev='hd'/> diff --git a/testing/config/kvm/bob.xml b/testing/config/kvm/bob.xml index d9a9b4c05..abd30dfef 100644 --- a/testing/config/kvm/bob.xml +++ b/testing/config/kvm/bob.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>131072</currentMemory> <vcpu placement='static'>1</vcpu> <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> <cmdline>root=/dev/vda1 loglevel=1</cmdline> <boot dev='hd'/> diff --git a/testing/config/kvm/carol.xml b/testing/config/kvm/carol.xml index fbdabe2e4..b28892232 100644 --- a/testing/config/kvm/carol.xml +++ b/testing/config/kvm/carol.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>131072</currentMemory> <vcpu placement='static'>1</vcpu> <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> <cmdline>root=/dev/vda1 loglevel=1</cmdline> <boot dev='hd'/> diff --git a/testing/config/kvm/dave.xml b/testing/config/kvm/dave.xml index bfebe9b60..880c992b0 100644 --- a/testing/config/kvm/dave.xml +++ b/testing/config/kvm/dave.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>131072</currentMemory> <vcpu placement='static'>1</vcpu> <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> <cmdline>root=/dev/vda1 loglevel=1</cmdline> <boot dev='hd'/> diff --git a/testing/config/kvm/moon.xml b/testing/config/kvm/moon.xml index e019fcea5..3ef3e6ec8 100644 --- a/testing/config/kvm/moon.xml +++ b/testing/config/kvm/moon.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>131072</currentMemory> <vcpu placement='static'>1</vcpu> <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> <cmdline>root=/dev/vda1 loglevel=1</cmdline> <boot dev='hd'/> diff --git a/testing/config/kvm/sun.xml b/testing/config/kvm/sun.xml index 5ed1a47ea..c80ce1210 100644 --- a/testing/config/kvm/sun.xml +++ b/testing/config/kvm/sun.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>131072</currentMemory> <vcpu placement='static'>1</vcpu> <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> <cmdline>root=/dev/vda1 loglevel=1</cmdline> <boot dev='hd'/> diff --git a/testing/config/kvm/venus.xml b/testing/config/kvm/venus.xml index 77a333655..d1e5fbca9 100644 --- a/testing/config/kvm/venus.xml +++ b/testing/config/kvm/venus.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>131072</currentMemory> <vcpu placement='static'>1</vcpu> <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> <cmdline>root=/dev/vda1 loglevel=1</cmdline> <boot dev='hd'/> diff --git a/testing/config/kvm/winnetou.xml b/testing/config/kvm/winnetou.xml index 99d5deb99..ffba7da31 100644 --- a/testing/config/kvm/winnetou.xml +++ b/testing/config/kvm/winnetou.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>131072</currentMemory> <vcpu placement='static'>1</vcpu> <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> <cmdline>root=/dev/vda1 loglevel=1</cmdline> <boot dev='hd'/> |