qemuxml2xmloutdata: Turn kvm-features*.xml into symlinks

There's no real difference between input and output XMLs for
kvm-features and kvm-features-off test cases. Do what we usually
do in such case - turn the output file into a symlink of the
input file.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>

diff --git a/tests/qemuxml2argvdata/kvm-features-off.xml b/tests/qemuxml2argvdata/kvm-features-off.xml
index fb7cbaf0610486b58daee43862c12fae255fd323..7ee6525cd94681532c17324ccb3553e4ed198247 100644 (file)
--- a/tests/qemuxml2argvdata/kvm-features-off.xml
+++ b/tests/qemuxml2argvdata/kvm-features-off.xml
@@ -18,17 +18,20 @@
       <dirty-ring state='off'/>
     </kvm>
   </features>
-  <cpu mode='host-passthrough' check='none'/>
+  <cpu mode='host-passthrough' check='none' migratable='off'/>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-i386</emulator>
-    <controller type='usb' index='0'/>
+    <controller type='usb' index='0'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
+    </controller>
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>
 </domain>

diff --git a/tests/qemuxml2argvdata/kvm-features.xml b/tests/qemuxml2argvdata/kvm-features.xml
index 900431c4ffca672bbfbf82f827902fe6cb7240a7..8ce3a2b98714bd5557fb645f8234c33018b59722 100644 (file)
--- a/tests/qemuxml2argvdata/kvm-features.xml
+++ b/tests/qemuxml2argvdata/kvm-features.xml
@@ -18,17 +18,20 @@
       <dirty-ring state='on' size='4096'/>
     </kvm>
   </features>
-  <cpu mode='host-passthrough' check='none'/>
+  <cpu mode='host-passthrough' check='none' migratable='off'/>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-i386</emulator>
-    <controller type='usb' index='0'/>
+    <controller type='usb' index='0'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
+    </controller>
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>
 </domain>

diff --git a/tests/qemuxml2xmloutdata/kvm-features-off.xml b/tests/qemuxml2xmloutdata/kvm-features-off.xml
deleted file mode 100644 (file)
index 7ee6525cd94681532c17324ccb3553e4ed198247..0000000000000000000000000000000000000000
--- a/tests/qemuxml2xmloutdata/kvm-features-off.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<domain type='kvm'>
-  <name>QEMUGuest1</name>
-  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
-  <memory unit='KiB'>219100</memory>
-  <currentMemory unit='KiB'>219100</currentMemory>
-  <vcpu placement='static'>6</vcpu>
-  <os>
-    <type arch='i686' machine='pc'>hvm</type>
-    <boot dev='network'/>
-  </os>
-  <features>
-    <acpi/>
-    <kvm>
-      <hidden state='off'/>
-      <hint-dedicated state='off'/>
-      <poll-control state='off'/>
-      <pv-ipi state='off'/>
-      <dirty-ring state='off'/>
-    </kvm>
-  </features>
-  <cpu mode='host-passthrough' check='none' migratable='off'/>
-  <clock offset='utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <emulator>/usr/bin/qemu-system-i386</emulator>
-    <controller type='usb' index='0'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
-    </controller>
-    <controller type='pci' index='0' model='pci-root'/>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <audio id='1' type='none'/>
-    <memballoon model='none'/>
-  </devices>
-</domain>

diff --git a/tests/qemuxml2xmloutdata/kvm-features-off.xml b/tests/qemuxml2xmloutdata/kvm-features-off.xml
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..047170b59a33056c246b54e8b27166e2919e4aa8
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/kvm-features-off.xml
@@ -0,0 +1 @@
+../qemuxml2argvdata/kvm-features-off.xml
\ No newline at end of file

diff --git a/tests/qemuxml2xmloutdata/kvm-features.xml b/tests/qemuxml2xmloutdata/kvm-features.xml
deleted file mode 100644 (file)
index 8ce3a2b98714bd5557fb645f8234c33018b59722..0000000000000000000000000000000000000000
--- a/tests/qemuxml2xmloutdata/kvm-features.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<domain type='kvm'>
-  <name>QEMUGuest1</name>
-  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
-  <memory unit='KiB'>219100</memory>
-  <currentMemory unit='KiB'>219100</currentMemory>
-  <vcpu placement='static'>6</vcpu>
-  <os>
-    <type arch='i686' machine='pc'>hvm</type>
-    <boot dev='network'/>
-  </os>
-  <features>
-    <acpi/>
-    <kvm>
-      <hidden state='on'/>
-      <hint-dedicated state='on'/>
-      <poll-control state='on'/>
-      <pv-ipi state='on'/>
-      <dirty-ring state='on' size='4096'/>
-    </kvm>
-  </features>
-  <cpu mode='host-passthrough' check='none' migratable='off'/>
-  <clock offset='utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <emulator>/usr/bin/qemu-system-i386</emulator>
-    <controller type='usb' index='0'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
-    </controller>
-    <controller type='pci' index='0' model='pci-root'/>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <audio id='1' type='none'/>
-    <memballoon model='none'/>
-  </devices>
-</domain>

diff --git a/tests/qemuxml2xmloutdata/kvm-features.xml b/tests/qemuxml2xmloutdata/kvm-features.xml
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..bda3acffac51e41985130e5981002ab2992cc2af
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/kvm-features.xml
@@ -0,0 +1 @@
+../qemuxml2argvdata/kvm-features.xml
\ No newline at end of file