External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-08 12:41:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: Normalize quotes for *-graphics

Browse Source 
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>
This commit is contained in:
Andrea Bolognani 2019-06-12 13:49:45 +02:00
parent fe09cd72aa
commit e13e64f49a
5 changed files with 128 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
tests/qemuxml2argvdata/aarch64-virt-graphics.xml
View File

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

48
tests/qemuxml2argvdata/ppc64-pseries-graphics.xml
View File

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

46
tests/qemuxml2argvdata/s390x-ccw-graphics.xml
View File

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

56
tests/qemuxml2argvdata/x86_64-pc-graphics.xml
View File

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

56
tests/qemuxml2argvdata/x86_64-q35-graphics.xml
View File

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