From: Tobias Brunner <tobias@strongswan.org>
Date: Fri, 8 Mar 2013 13:18:54 +0000 (+0100)
Subject: testing: Don't use a specific version for the QEMU machine type
X-Git-Tag: 5.0.3rc1~44
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9525e9c506fc30457a396838ab8ef801e23c79dd;p=thirdparty%2Fstrongswan.git

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.
---

diff --git a/testing/config/kvm/alice.xml b/testing/config/kvm/alice.xml
index 6ca78f8619..87a9600034 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 d9a9b4c051..abd30dfef7 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 fbdabe2e42..b288922321 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 bfebe9b608..880c992b0f 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 e019fcea5b..3ef3e6ec88 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 5ed1a47eae..c80ce1210d 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 77a333655f..d1e5fbca90 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 99d5deb99a..ffba7da31b 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'/>