tests: Simplify some ppc64 tests

We can leave out things like USB controller, memballoon device,
kernel and initrd since they're not the focus of the tests.

Propagating some information from the output files back to the
input files makes it easier to compare them, as it reduces the
resulting diff, and in the case of the qemuxml2xml test for
memory-hotplug-ppc64-nonuma it allows us to convert the output
file into a symlink, since in the specific case the XML doesn't
change at all.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>

tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.args

@@ -27,6 +27,4 @@ uuid=49545eb3-75e1-2d0a-acdd-f0294406c99e,memdev=memnvdimm0,id=nvdimm0,slot=0 \
 server,nowait \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
--no-shutdown \
--usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
+-no-shutdown

tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.xml

@@ -21,16 +21,12 @@
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-ppc64</emulator>
-    <controller type='usb' index='0'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
-    </controller>
+    <controller type='usb' index='0' model='none'/>
     <controller type='pci' index='0' model='pci-root'>
       <model name='spapr-pci-host-bridge'/>
       <target index='0'/>
     </controller>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
-    </memballoon>
+    <memballoon model='none'/>
     <panic model='pseries'/>
     <memory model='nvdimm'>
       <uuid>49545eb3-75e1-2d0a-acdd-f0294406c99e</uuid>

tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.args

@@ -26,9 +26,4 @@ QEMU_AUDIO_DRV=none \
 server,nowait \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
--no-shutdown \
--kernel /media/ram/uImage \
--initrd /media/ram/ramdisk \
--append 'root=/dev/ram rw console=ttyS0,115200' \
--usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
+-no-shutdown

tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.xml

@@ -7,9 +7,7 @@
   <vcpu placement='static'>1</vcpu>
   <os>
     <type arch='ppc64' machine='pseries'>hvm</type>
-    <kernel>/media/ram/uImage</kernel>
-    <initrd>/media/ram/ramdisk</initrd>
-    <cmdline>root=/dev/ram rw console=ttyS0,115200</cmdline>
+    <boot dev='hd'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
@@ -17,16 +15,24 @@
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-ppc64</emulator>
-    <memballoon model='virtio'/>
+    <controller type='usb' index='0' model='none'/>
+    <controller type='pci' index='0' model='pci-root'>
+      <model name='spapr-pci-host-bridge'/>
+      <target index='0'/>
+    </controller>
+    <memballoon model='none'/>
+    <panic model='pseries'/>
     <memory model='dimm'>
       <target>
         <size unit='KiB'>523264</size>
       </target>
+      <address type='dimm' slot='0'/>
     </memory>
     <memory model='dimm'>
       <target>
         <size unit='KiB'>524287</size>
       </target>
+      <address type='dimm' slot='1'/>
     </memory>
   </devices>
 </domain>

tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-ppc64.xml

@@ -21,16 +21,12 @@
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-ppc64</emulator>
-    <controller type='usb' index='0'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
-    </controller>
+    <controller type='usb' index='0' model='none'/>
     <controller type='pci' index='0' model='pci-root'>
       <model name='spapr-pci-host-bridge'/>
       <target index='0'/>
     </controller>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
-    </memballoon>
+    <memballoon model='none'/>
     <panic model='pseries'/>
     <memory model='nvdimm'>
       <uuid>49545eb3-75e1-2d0a-acdd-f0294406c99e</uuid>

tests/qemuxml2xmloutdata/memory-hotplug-ppc64-nonuma.xml

@@ -1,45 +0,0 @@
-<domain type='kvm'>
-  <name>QEMUGuest1</name>
-  <uuid>49545eb3-75e1-2d0a-acdd-f0294406c99e</uuid>
-  <maxMemory slots='16' unit='KiB'>4194304</maxMemory>
-  <memory unit='KiB'>2097152</memory>
-  <currentMemory unit='KiB'>2097152</currentMemory>
-  <vcpu placement='static'>1</vcpu>
-  <os>
-    <type arch='ppc64' machine='pseries'>hvm</type>
-    <kernel>/media/ram/uImage</kernel>
-    <initrd>/media/ram/ramdisk</initrd>
-    <cmdline>root=/dev/ram rw console=ttyS0,115200</cmdline>
-    <boot dev='hd'/>
-  </os>
-  <clock offset='utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <emulator>/usr/bin/qemu-system-ppc64</emulator>
-    <controller type='usb' index='0'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
-    </controller>
-    <controller type='pci' index='0' model='pci-root'>
-      <model name='spapr-pci-host-bridge'/>
-      <target index='0'/>
-    </controller>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
-    </memballoon>
-    <panic model='pseries'/>
-    <memory model='dimm'>
-      <target>
-        <size unit='KiB'>523264</size>
-      </target>
-      <address type='dimm' slot='0'/>
-    </memory>
-    <memory model='dimm'>
-      <target>
-        <size unit='KiB'>524287</size>
-      </target>
-      <address type='dimm' slot='1'/>
-    </memory>
-  </devices>
-</domain>

tests/qemuxml2xmloutdata/memory-hotplug-ppc64-nonuma.xml

@@ -0,0 +1 @@
+../qemuxml2argvdata/memory-hotplug-ppc64-nonuma.xml