There are three test XMLs that have useless spaces at the
beginning of each line. I intend to add these to qemuxml2xmltest
and make xmlout a symlink to the original XML. In order to do
that the XMLs must look better than they do now.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
.../fd-memory-numa-topology2.xml | 62 ++++++++--------
.../fd-memory-numa-topology3.xml | 64 ++++++++---------
tests/qemuxml2argvdata/memfd-memory-numa.xml | 72 +++++++++----------
3 files changed, 99 insertions(+), 99 deletions(-)
diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology2.xml
b/tests/qemuxml2argvdata/fd-memory-numa-topology2.xml
index 49beff188b..31f4567737 100644
--- a/tests/qemuxml2argvdata/fd-memory-numa-topology2.xml
+++ b/tests/qemuxml2argvdata/fd-memory-numa-topology2.xml
@@ -1,31 +1,31 @@
- <domain type='kvm' id='56'>
- <name>instance-00000092</name>
- <uuid>126f2720-6f8e-45ab-a886-ec9277079a67</uuid>
- <memory unit='KiB'>14680064</memory>
- <currentMemory unit='KiB'>14680064</currentMemory>
- <memoryBacking>
- <source type='file'/>
- <access mode='private'/>
- <allocation mode='immediate'/>
- </memoryBacking>
- <vcpu placement='static'>20</vcpu>
- <os>
- <type arch='x86_64'
machine='pc-i440fx-wily'>hvm</type>
- <boot dev='hd'/>
- </os>
- <cpu>
- <topology sockets='1' cores='8' threads='1'/>
- <numa>
- <cell id='0' cpus='0-7' memory='14680064'
unit='KiB'/>
- <cell id='1' cpus='8-15' memory='14680064'
unit='KiB' memAccess='shared'/>
- </numa>
- </cpu>
- <clock offset='utc'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>destroy</on_crash>
- <devices>
- <emulator>/usr/bin/qemu-system-x86_64</emulator>
- <memballoon model='virtio'/>
- </devices>
- </domain>
+<domain type='kvm' id='56'>
+ <name>instance-00000092</name>
+ <uuid>126f2720-6f8e-45ab-a886-ec9277079a67</uuid>
+ <memory unit='KiB'>14680064</memory>
+ <currentMemory unit='KiB'>14680064</currentMemory>
+ <memoryBacking>
+ <source type='file'/>
+ <access mode='private'/>
+ <allocation mode='immediate'/>
+ </memoryBacking>
+ <vcpu placement='static'>20</vcpu>
+ <os>
+ <type arch='x86_64' machine='pc-i440fx-wily'>hvm</type>
+ <boot dev='hd'/>
+ </os>
+ <cpu>
+ <topology sockets='1' cores='8' threads='1'/>
+ <numa>
+ <cell id='0' cpus='0-7' memory='14680064'
unit='KiB'/>
+ <cell id='1' cpus='8-15' memory='14680064'
unit='KiB' memAccess='shared'/>
+ </numa>
+ </cpu>
+ <clock offset='utc'/>
+ <on_poweroff>destroy</on_poweroff>
+ <on_reboot>restart</on_reboot>
+ <on_crash>destroy</on_crash>
+ <devices>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
+ <memballoon model='virtio'/>
+ </devices>
+</domain>
diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology3.xml
b/tests/qemuxml2argvdata/fd-memory-numa-topology3.xml
index 7933507592..42d8a3bdad 100644
--- a/tests/qemuxml2argvdata/fd-memory-numa-topology3.xml
+++ b/tests/qemuxml2argvdata/fd-memory-numa-topology3.xml
@@ -1,32 +1,32 @@
- <domain type='kvm' id='56'>
- <name>instance-00000092</name>
- <uuid>126f2720-6f8e-45ab-a886-ec9277079a67</uuid>
- <memory unit='KiB'>14680064</memory>
- <currentMemory unit='KiB'>14680064</currentMemory>
- <memoryBacking>
- <source type='file'/>
- <access mode='shared'/>
- <allocation mode='immediate'/>
- </memoryBacking>
- <vcpu placement='static'>32</vcpu>
- <os>
- <type arch='x86_64'
machine='pc-i440fx-wily'>hvm</type>
- <boot dev='hd'/>
- </os>
- <cpu>
- <topology sockets='1' cores='24' threads='1'/>
- <numa>
- <cell id='0' cpus='0-1' memory='14680064'
unit='KiB'/>
- <cell id='1' cpus='2-3' memory='14680064'
unit='KiB' memAccess='shared'/>
- <cell id='2' cpus='4-5' memory='14680064'
unit='KiB' memAccess='private'/>
- </numa>
- </cpu>
- <clock offset='utc'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>destroy</on_crash>
- <devices>
- <emulator>/usr/bin/qemu-system-x86_64</emulator>
- <memballoon model='virtio'/>
- </devices>
- </domain>
+<domain type='kvm' id='56'>
+ <name>instance-00000092</name>
+ <uuid>126f2720-6f8e-45ab-a886-ec9277079a67</uuid>
+ <memory unit='KiB'>14680064</memory>
+ <currentMemory unit='KiB'>14680064</currentMemory>
+ <memoryBacking>
+ <source type='file'/>
+ <access mode='shared'/>
+ <allocation mode='immediate'/>
+ </memoryBacking>
+ <vcpu placement='static'>32</vcpu>
+ <os>
+ <type arch='x86_64' machine='pc-i440fx-wily'>hvm</type>
+ <boot dev='hd'/>
+ </os>
+ <cpu>
+ <topology sockets='1' cores='24' threads='1'/>
+ <numa>
+ <cell id='0' cpus='0-1' memory='14680064'
unit='KiB'/>
+ <cell id='1' cpus='2-3' memory='14680064'
unit='KiB' memAccess='shared'/>
+ <cell id='2' cpus='4-5' memory='14680064'
unit='KiB' memAccess='private'/>
+ </numa>
+ </cpu>
+ <clock offset='utc'/>
+ <on_poweroff>destroy</on_poweroff>
+ <on_reboot>restart</on_reboot>
+ <on_crash>destroy</on_crash>
+ <devices>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
+ <memballoon model='virtio'/>
+ </devices>
+</domain>
diff --git a/tests/qemuxml2argvdata/memfd-memory-numa.xml
b/tests/qemuxml2argvdata/memfd-memory-numa.xml
index 8416a990fa..41c1f9bfc2 100644
--- a/tests/qemuxml2argvdata/memfd-memory-numa.xml
+++ b/tests/qemuxml2argvdata/memfd-memory-numa.xml
@@ -1,36 +1,36 @@
- <domain type='kvm' id='56'>
- <name>instance-00000092</name>
- <uuid>126f2720-6f8e-45ab-a886-ec9277079a67</uuid>
- <memory unit='KiB'>14680064</memory>
- <currentMemory unit='KiB'>14680064</currentMemory>
- <memoryBacking>
- <hugepages>
- <page size="2" unit="M"/>
- </hugepages>
- <source type='memfd'/>
- <access mode='shared'/>
- <allocation mode='immediate'/>
- </memoryBacking>
- <numatune>
- <memnode cellid='0' mode='preferred' nodeset='3'/>
- </numatune>
- <vcpu placement='static'>8</vcpu>
- <os>
- <type arch='x86_64'
machine='pc-i440fx-wily'>hvm</type>
- <boot dev='hd'/>
- </os>
- <cpu>
- <topology sockets='1' cores='8' threads='1'/>
- <numa>
- <cell id='0' cpus='0-7' memory='14680064'
unit='KiB'/>
- </numa>
- </cpu>
- <clock offset='utc'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>destroy</on_crash>
- <devices>
- <emulator>/usr/bin/qemu-system-x86_64</emulator>
- <memballoon model='virtio'/>
- </devices>
- </domain>
+<domain type='kvm' id='56'>
+ <name>instance-00000092</name>
+ <uuid>126f2720-6f8e-45ab-a886-ec9277079a67</uuid>
+ <memory unit='KiB'>14680064</memory>
+ <currentMemory unit='KiB'>14680064</currentMemory>
+ <memoryBacking>
+ <hugepages>
+ <page size="2" unit="M"/>
+ </hugepages>
+ <source type='memfd'/>
+ <access mode='shared'/>
+ <allocation mode='immediate'/>
+ </memoryBacking>
+ <numatune>
+ <memnode cellid='0' mode='preferred' nodeset='3'/>
+ </numatune>
+ <vcpu placement='static'>8</vcpu>
+ <os>
+ <type arch='x86_64' machine='pc-i440fx-wily'>hvm</type>
+ <boot dev='hd'/>
+ </os>
+ <cpu>
+ <topology sockets='1' cores='8' threads='1'/>
+ <numa>
+ <cell id='0' cpus='0-7' memory='14680064'
unit='KiB'/>
+ </numa>
+ </cpu>
+ <clock offset='utc'/>
+ <on_poweroff>destroy</on_poweroff>
+ <on_reboot>restart</on_reboot>
+ <on_crash>destroy</on_crash>
+ <devices>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
+ <memballoon model='virtio'/>
+ </devices>
+</domain>
--
2.21.0