tests: Normalize quotes for *-graphics

Right now *-headless and *-graphics tests are using different
quoting styles, which results in the diff between them being
basically useless, whereas we would like it to be possible to
compare these files directly and easily spot the differences.

Convert all *-graphics tests to single quotes, which is the
style libvirt itself uses when formatting XML: this is a fact
that will come in handy later.

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

diff --git a/tests/qemuxml2argvdata/aarch64-virt-graphics.xml b/tests/qemuxml2argvdata/aarch64-virt-graphics.xml
index 0748b8da2dbf41acec538dfe2fae00886913f88b..54cfea634ca041ab3140ecfb4f5125e3dd39165e 100644 (file)
--- a/tests/qemuxml2argvdata/aarch64-virt-graphics.xml
+++ b/tests/qemuxml2argvdata/aarch64-virt-graphics.xml
@@ -1,49 +1,49 @@
-<domain type="qemu">
+<domain type='qemu'>
   <name>guest</name>
   <uuid>33844184-97c0-4cc0-aa7d-206f5803530b</uuid>
   <metadata>
-    <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
-      <libosinfo:os id="http://fedoraproject.org/fedora/29"/>
+    <libosinfo:libosinfo xmlns:libosinfo='http://libosinfo.org/xmlns/libvirt/domain/1.0'>
+      <libosinfo:os id='http://fedoraproject.org/fedora/29'/>
     </libosinfo:libosinfo>
   </metadata>
   <memory>4194304</memory>
   <currentMemory>4194304</currentMemory>
   <vcpu>4</vcpu>
   <os>
-    <type arch="aarch64" machine="virt">hvm</type>
-    <loader readonly="yes" type="pflash">/usr/share/AAVMF/AAVMF_CODE.fd</loader>
+    <type arch='aarch64' machine='virt'>hvm</type>
+    <loader readonly='yes' type='pflash'>/usr/share/AAVMF/AAVMF_CODE.fd</loader>
     <nvram>/var/lib/libvirt/qemu/nvram/guest_VARS.fd</nvram>
-    <boot dev="hd"/>
+    <boot dev='hd'/>
   </os>
   <features>
     <acpi/>
   </features>
-  <clock offset="utc"/>
+  <clock offset='utc'/>
   <devices>
     <emulator>/usr/bin/qemu-system-aarch64</emulator>
-    <disk type="file" device="disk">
-      <driver name="qemu" type="qcow2"/>
-      <source file="/var/lib/libvirt/images/guest.qcow2"/>
-      <target dev="vda" bus="virtio"/>
+    <disk type='file' device='disk'>
+      <driver name='qemu' type='qcow2'/>
+      <source file='/var/lib/libvirt/images/guest.qcow2'/>
+      <target dev='vda' bus='virtio'/>
     </disk>
-    <controller type="usb" index="0" model="qemu-xhci" ports="15"/>
-    <interface type="user">
-      <mac address="52:54:00:53:45:a5"/>
-      <model type="virtio"/>
+    <controller type='usb' index='0' model='qemu-xhci' ports='15'/>
+    <interface type='user'>
+      <mac address='52:54:00:53:45:a5'/>
+      <model type='virtio'/>
     </interface>
-    <console type="pty"/>
-    <channel type="unix">
-      <source mode="bind"/>
-      <target type="virtio" name="org.qemu.guest_agent.0"/>
+    <console type='pty'/>
+    <channel type='unix'>
+      <source mode='bind'/>
+      <target type='virtio' name='org.qemu.guest_agent.0'/>
     </channel>
-    <input type="tablet" bus="usb"/>
-    <input type="keyboard" bus="usb"/>
-    <graphics type="vnc" port="-1"/>
+    <input type='tablet' bus='usb'/>
+    <input type='keyboard' bus='usb'/>
+    <graphics type='vnc' port='-1'/>
     <video>
-      <model type="virtio"/>
+      <model type='virtio'/>
     </video>
-    <rng model="virtio">
-      <backend model="random">/dev/urandom</backend>
+    <rng model='virtio'>
+      <backend model='random'>/dev/urandom</backend>
     </rng>
   </devices>
 </domain>

diff --git a/tests/qemuxml2argvdata/ppc64-pseries-graphics.xml b/tests/qemuxml2argvdata/ppc64-pseries-graphics.xml
index 3d54a4f171c48116d649b794430396d3cb471f5f..c4ef08b2bf3b937009c8491dc225e292ae2902e0 100644 (file)
--- a/tests/qemuxml2argvdata/ppc64-pseries-graphics.xml
+++ b/tests/qemuxml2argvdata/ppc64-pseries-graphics.xml
@@ -1,44 +1,44 @@
-<domain type="qemu">
+<domain type='qemu'>
   <name>guest</name>
   <uuid>b35969f7-e7cf-4d90-a9a0-4dd9000f9824</uuid>
   <metadata>
-    <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
-      <libosinfo:os id="http://fedoraproject.org/fedora/29"/>
+    <libosinfo:libosinfo xmlns:libosinfo='http://libosinfo.org/xmlns/libvirt/domain/1.0'>
+      <libosinfo:os id='http://fedoraproject.org/fedora/29'/>
     </libosinfo:libosinfo>
   </metadata>
   <memory>4194304</memory>
   <currentMemory>4194304</currentMemory>
   <vcpu>4</vcpu>
   <os>
-    <type arch="ppc64le" machine="pseries">hvm</type>
-    <boot dev="hd"/>
+    <type arch='ppc64le' machine='pseries'>hvm</type>
+    <boot dev='hd'/>
   </os>
-  <clock offset="utc"/>
+  <clock offset='utc'/>
   <devices>
     <emulator>/usr/bin/qemu-system-ppc64</emulator>
-    <disk type="file" device="disk">
-      <driver name="qemu" type="qcow2"/>
-      <source file="/var/lib/libvirt/images/guest.qcow2"/>
-      <target dev="vda" bus="virtio"/>
+    <disk type='file' device='disk'>
+      <driver name='qemu' type='qcow2'/>
+      <source file='/var/lib/libvirt/images/guest.qcow2'/>
+      <target dev='vda' bus='virtio'/>
     </disk>
-    <controller type="usb" index="0" model="qemu-xhci" ports="15"/>
-    <interface type="user">
-      <mac address="52:54:00:a2:44:92"/>
-      <model type="virtio"/>
+    <controller type='usb' index='0' model='qemu-xhci' ports='15'/>
+    <interface type='user'>
+      <mac address='52:54:00:a2:44:92'/>
+      <model type='virtio'/>
     </interface>
-    <console type="pty"/>
-    <channel type="unix">
-      <source mode="bind"/>
-      <target type="virtio" name="org.qemu.guest_agent.0"/>
+    <console type='pty'/>
+    <channel type='unix'>
+      <source mode='bind'/>
+      <target type='virtio' name='org.qemu.guest_agent.0'/>
     </channel>
-    <input type="tablet" bus="usb"/>
-    <input type="keyboard" bus="usb"/>
-    <graphics type="vnc" port="-1"/>
+    <input type='tablet' bus='usb'/>
+    <input type='keyboard' bus='usb'/>
+    <graphics type='vnc' port='-1'/>
     <video>
-      <model type="vga"/>
+      <model type='vga'/>
     </video>
-    <rng model="virtio">
-      <backend model="random">/dev/urandom</backend>
+    <rng model='virtio'>
+      <backend model='random'>/dev/urandom</backend>
     </rng>
   </devices>
 </domain>

diff --git a/tests/qemuxml2argvdata/s390x-ccw-graphics.xml b/tests/qemuxml2argvdata/s390x-ccw-graphics.xml
index 3f54fdf9bdd26bf915d7239e8d0db79001c5a7de..a9bb3485dbae933b6c04c550ca9146ec2c77ecd1 100644 (file)
--- a/tests/qemuxml2argvdata/s390x-ccw-graphics.xml
+++ b/tests/qemuxml2argvdata/s390x-ccw-graphics.xml
@@ -1,43 +1,43 @@
-<domain type="qemu">
+<domain type='qemu'>
   <name>guest</name>
   <uuid>a7ca230a-fbe0-48b8-8ea6-25836f8cbc32</uuid>
   <metadata>
-    <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
-      <libosinfo:os id="http://fedoraproject.org/fedora/29"/>
+    <libosinfo:libosinfo xmlns:libosinfo='http://libosinfo.org/xmlns/libvirt/domain/1.0'>
+      <libosinfo:os id='http://fedoraproject.org/fedora/29'/>
     </libosinfo:libosinfo>
   </metadata>
   <memory>4194304</memory>
   <currentMemory>4194304</currentMemory>
   <vcpu>4</vcpu>
   <os>
-    <type arch="s390x" machine="s390-ccw">hvm</type>
-    <boot dev="hd"/>
+    <type arch='s390x' machine='s390-ccw'>hvm</type>
+    <boot dev='hd'/>
   </os>
-  <clock offset="utc"/>
+  <clock offset='utc'/>
   <devices>
     <emulator>/usr/bin/qemu-system-s390x</emulator>
-    <disk type="file" device="disk">
-      <driver name="qemu" type="qcow2"/>
-      <source file="/var/lib/libvirt/images/guest.qcow2"/>
-      <target dev="vda" bus="virtio"/>
+    <disk type='file' device='disk'>
+      <driver name='qemu' type='qcow2'/>
+      <source file='/var/lib/libvirt/images/guest.qcow2'/>
+      <target dev='vda' bus='virtio'/>
     </disk>
-    <interface type="user">
-      <mac address="52:54:00:09:1a:29"/>
-      <model type="virtio"/>
+    <interface type='user'>
+      <mac address='52:54:00:09:1a:29'/>
+      <model type='virtio'/>
     </interface>
-    <console type="pty"/>
-    <channel type="unix">
-      <source mode="bind"/>
-      <target type="virtio" name="org.qemu.guest_agent.0"/>
+    <console type='pty'/>
+    <channel type='unix'>
+      <source mode='bind'/>
+      <target type='virtio' name='org.qemu.guest_agent.0'/>
     </channel>
-    <input type="tablet" bus="virtio"/>
-    <input type="keyboard" bus="virtio"/>
-    <graphics type="vnc" port="-1"/>
+    <input type='tablet' bus='virtio'/>
+    <input type='keyboard' bus='virtio'/>
+    <graphics type='vnc' port='-1'/>
     <video>
-      <model type="virtio"/>
+      <model type='virtio'/>
     </video>
-    <rng model="virtio">
-      <backend model="random">/dev/urandom</backend>
+    <rng model='virtio'>
+      <backend model='random'>/dev/urandom</backend>
     </rng>
   </devices>
 </domain>

diff --git a/tests/qemuxml2argvdata/x86_64-pc-graphics.xml b/tests/qemuxml2argvdata/x86_64-pc-graphics.xml
index 03745eabf4188e310ed278bb558ea36ce316bd2b..3c7dbc94381459db0387f97676448e7b70d5de9b 100644 (file)
--- a/tests/qemuxml2argvdata/x86_64-pc-graphics.xml
+++ b/tests/qemuxml2argvdata/x86_64-pc-graphics.xml
@@ -1,55 +1,55 @@
-<domain type="qemu">
+<domain type='qemu'>
   <name>guest</name>
   <uuid>2c0abd3d-8f18-42c0-a132-9708213aaac9</uuid>
   <metadata>
-    <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
-      <libosinfo:os id="http://fedoraproject.org/fedora/29"/>
+    <libosinfo:libosinfo xmlns:libosinfo='http://libosinfo.org/xmlns/libvirt/domain/1.0'>
+      <libosinfo:os id='http://fedoraproject.org/fedora/29'/>
     </libosinfo:libosinfo>
   </metadata>
   <memory>4194304</memory>
   <currentMemory>4194304</currentMemory>
   <vcpu>4</vcpu>
   <os>
-    <type arch="x86_64" machine="pc">hvm</type>
-    <boot dev="hd"/>
+    <type arch='x86_64' machine='pc'>hvm</type>
+    <boot dev='hd'/>
   </os>
   <features>
     <acpi/>
     <apic/>
   </features>
-  <clock offset="utc">
-    <timer name="rtc" tickpolicy="catchup"/>
-    <timer name="pit" tickpolicy="delay"/>
-    <timer name="hpet" present="no"/>
+  <clock offset='utc'>
+    <timer name='rtc' tickpolicy='catchup'/>
+    <timer name='pit' tickpolicy='delay'/>
+    <timer name='hpet' present='no'/>
   </clock>
   <pm>
-    <suspend-to-mem enabled="no"/>
-    <suspend-to-disk enabled="no"/>
+    <suspend-to-mem enabled='no'/>
+    <suspend-to-disk enabled='no'/>
   </pm>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <disk type="file" device="disk">
-      <driver name="qemu" type="qcow2"/>
-      <source file="/var/lib/libvirt/images/guest.qcow2"/>
-      <target dev="vda" bus="virtio"/>
+    <disk type='file' device='disk'>
+      <driver name='qemu' type='qcow2'/>
+      <source file='/var/lib/libvirt/images/guest.qcow2'/>
+      <target dev='vda' bus='virtio'/>
     </disk>
-    <controller type="usb" index="0" model="qemu-xhci" ports="15"/>
-    <interface type="user">
-      <mac address="52:54:00:4c:e3:86"/>
-      <model type="virtio"/>
+    <controller type='usb' index='0' model='qemu-xhci' ports='15'/>
+    <interface type='user'>
+      <mac address='52:54:00:4c:e3:86'/>
+      <model type='virtio'/>
     </interface>
-    <console type="pty"/>
-    <channel type="unix">
-      <source mode="bind"/>
-      <target type="virtio" name="org.qemu.guest_agent.0"/>
+    <console type='pty'/>
+    <channel type='unix'>
+      <source mode='bind'/>
+      <target type='virtio' name='org.qemu.guest_agent.0'/>
     </channel>
-    <input type="tablet" bus="usb"/>
-    <graphics type="vnc" port="-1"/>
+    <input type='tablet' bus='usb'/>
+    <graphics type='vnc' port='-1'/>
     <video>
-      <model type="qxl"/>
+      <model type='qxl'/>
     </video>
-    <rng model="virtio">
-      <backend model="random">/dev/urandom</backend>
+    <rng model='virtio'>
+      <backend model='random'>/dev/urandom</backend>
     </rng>
   </devices>
 </domain>

diff --git a/tests/qemuxml2argvdata/x86_64-q35-graphics.xml b/tests/qemuxml2argvdata/x86_64-q35-graphics.xml
index 56db898e6456ff6013419fc2572404502d54b30d..d3ad87c96358d28b5ca6120753def6a61747d2ac 100644 (file)
--- a/tests/qemuxml2argvdata/x86_64-q35-graphics.xml
+++ b/tests/qemuxml2argvdata/x86_64-q35-graphics.xml
@@ -1,55 +1,55 @@
-<domain type="qemu">
+<domain type='qemu'>
   <name>guest</name>
   <uuid>61288c03-0b0d-4f1e-9496-0f0256f2e013</uuid>
   <metadata>
-    <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
-      <libosinfo:os id="http://fedoraproject.org/fedora/29"/>
+    <libosinfo:libosinfo xmlns:libosinfo='http://libosinfo.org/xmlns/libvirt/domain/1.0'>
+      <libosinfo:os id='http://fedoraproject.org/fedora/29'/>
     </libosinfo:libosinfo>
   </metadata>
   <memory>4194304</memory>
   <currentMemory>4194304</currentMemory>
   <vcpu>4</vcpu>
   <os>
-    <type arch="x86_64" machine="q35">hvm</type>
-    <boot dev="hd"/>
+    <type arch='x86_64' machine='q35'>hvm</type>
+    <boot dev='hd'/>
   </os>
   <features>
     <acpi/>
     <apic/>
   </features>
-  <clock offset="utc">
-    <timer name="rtc" tickpolicy="catchup"/>
-    <timer name="pit" tickpolicy="delay"/>
-    <timer name="hpet" present="no"/>
+  <clock offset='utc'>
+    <timer name='rtc' tickpolicy='catchup'/>
+    <timer name='pit' tickpolicy='delay'/>
+    <timer name='hpet' present='no'/>
   </clock>
   <pm>
-    <suspend-to-mem enabled="no"/>
-    <suspend-to-disk enabled="no"/>
+    <suspend-to-mem enabled='no'/>
+    <suspend-to-disk enabled='no'/>
   </pm>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <disk type="file" device="disk">
-      <driver name="qemu" type="qcow2"/>
-      <source file="/var/lib/libvirt/images/guest.qcow2"/>
-      <target dev="vda" bus="virtio"/>
+    <disk type='file' device='disk'>
+      <driver name='qemu' type='qcow2'/>
+      <source file='/var/lib/libvirt/images/guest.qcow2'/>
+      <target dev='vda' bus='virtio'/>
     </disk>
-    <controller type="usb" index="0" model="qemu-xhci" ports="15"/>
-    <interface type="user">
-      <mac address="52:54:00:d2:70:0b"/>
-      <model type="virtio"/>
+    <controller type='usb' index='0' model='qemu-xhci' ports='15'/>
+    <interface type='user'>
+      <mac address='52:54:00:d2:70:0b'/>
+      <model type='virtio'/>
     </interface>
-    <console type="pty"/>
-    <channel type="unix">
-      <source mode="bind"/>
-      <target type="virtio" name="org.qemu.guest_agent.0"/>
+    <console type='pty'/>
+    <channel type='unix'>
+      <source mode='bind'/>
+      <target type='virtio' name='org.qemu.guest_agent.0'/>
     </channel>
-    <input type="tablet" bus="usb"/>
-    <graphics type="vnc" port="-1"/>
+    <input type='tablet' bus='usb'/>
+    <graphics type='vnc' port='-1'/>
     <video>
-      <model type="qxl"/>
+      <model type='qxl'/>
     </video>
-    <rng model="virtio">
-      <backend model="random">/dev/urandom</backend>
+    <rng model='virtio'>
+      <backend model='random'>/dev/urandom</backend>
     </rng>
   </devices>
 </domain>