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 6ca78f8619287679ed463249637549ae8c0cdf7b..87a96000345c8aa2bd1c512ce858bbfbc1692ede 100644 (file)
--- 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 d9a9b4c051ef87dda30bc4dffbe3faa087f348af..abd30dfef748d3f7715a2bd9b5fafd7e71e20701 100644 (file)
--- 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 fbdabe2e4253981b9018a5cf527605b7e45a90ee..b288922321892ff88406c9fc274d36de9c57d231 100644 (file)
--- 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 bfebe9b608089f611a96a5001fe3f1115654911f..880c992b0fb8c5a5ebadbbc94182250cc2245082 100644 (file)
--- 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 e019fcea5bc02dd60785e8a1d5ad9dd11ca129ce..3ef3e6ec88f5574495f1b41c0311ba3ab3bf75f2 100644 (file)
--- 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 5ed1a47eae0294eec258a045002b4da57e130e2a..c80ce1210dadd6a7cd459eebef9f256767b82503 100644 (file)
--- 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 77a333655f29cfec64a98fee49e01d500e5148d8..d1e5fbca90d7c31eb5a052d61df28cb14d69bde2 100644 (file)
--- 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 99d5deb99a13b8b930224dd2bf45e6afdde1fe3b..ffba7da31b99637da63447b281c5980491278ca1 100644 (file)
--- 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'/>