I've found two files under qemuxml2xmloutdata/ that are the same as in qemuxml2argvdata/. Replace them with symlinks. Signed-off-by: Michal Privoznik <mprivozn@xxxxxxxxxx> --- tests/qemuxml2xmloutdata/downscript.xml | 61 +------------------ .../video-qxl-resolution.xml | 43 +------------ 2 files changed, 2 insertions(+), 102 deletions(-) mode change 100644 => 120000 tests/qemuxml2xmloutdata/downscript.xml mode change 100644 => 120000 tests/qemuxml2xmloutdata/video-qxl-resolution.xml diff --git a/tests/qemuxml2xmloutdata/downscript.xml b/tests/qemuxml2xmloutdata/downscript.xml deleted file mode 100644 index 4d0fb1beab..0000000000 --- a/tests/qemuxml2xmloutdata/downscript.xml +++ /dev/null @@ -1,60 +0,0 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219136</memory> - <currentMemory unit='KiB'>219136</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='x86_64' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <cpu mode='custom' match='exact' check='none'> - <model fallback='forbid'>qemu64</model> - </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> - <disk type='file' device='disk'> - <driver name='qemu' type='raw'/> - <source file='/var/lib/libvirt/images/img1'/> - <target dev='vda' bus='virtio'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x0a' function='0x0'/> - </disk> - <controller type='usb' index='0' model='piix3-uhci'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> - </controller> - <controller type='ide' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> - </controller> - <controller type='pci' index='0' model='pci-root'/> - <controller type='virtio-serial' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x09' function='0x0'/> - </controller> - <filesystem type='mount' accessmode='passthrough'> - <source dir='/export/fs1'/> - <target dir='fs1'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> - </filesystem> - <filesystem type='mount' accessmode='mapped'> - <driver type='path'/> - <source dir='/export/fs2'/> - <target dir='fs2'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> - </filesystem> - <interface type='ethernet'> - <mac address='52:54:00:f6:66:88'/> - <script path='/home/ifup.sh'/> - <downscript path='/home/ifdown.sh'/> - <model type='virtio'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x0b' function='0x0'/> - </interface> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='virtio'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x0c' function='0x0'/> - </memballoon> - </devices> -</domain> diff --git a/tests/qemuxml2xmloutdata/downscript.xml b/tests/qemuxml2xmloutdata/downscript.xml new file mode 120000 index 0000000000..5edee5a7c4 --- /dev/null +++ b/tests/qemuxml2xmloutdata/downscript.xml @@ -0,0 +1 @@ +../qemuxml2argvdata/downscript.xml \ No newline at end of file diff --git a/tests/qemuxml2xmloutdata/video-qxl-resolution.xml b/tests/qemuxml2xmloutdata/video-qxl-resolution.xml deleted file mode 100644 index e693cbce47..0000000000 --- a/tests/qemuxml2xmloutdata/video-qxl-resolution.xml +++ /dev/null @@ -1,42 +0,0 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219136</memory> - <currentMemory unit='KiB'>219136</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='i686' machine='pc'>hvm</type> - <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-i386</emulator> - <disk type='block' device='disk'> - <driver name='qemu' type='raw'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <controller type='usb' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> - </controller> - <controller type='ide' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> - </controller> - <controller type='pci' index='0' model='pci-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <video> - <model type='qxl' ram='65536' vram='65536' vgamem='8192' heads='1' primary='yes'> - <resolution x='1280' y='720'/> - </model> - <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> - </video> - <memballoon model='virtio'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> - </memballoon> - </devices> -</domain> diff --git a/tests/qemuxml2xmloutdata/video-qxl-resolution.xml b/tests/qemuxml2xmloutdata/video-qxl-resolution.xml new file mode 120000 index 0000000000..f2d0595dda --- /dev/null +++ b/tests/qemuxml2xmloutdata/video-qxl-resolution.xml @@ -0,0 +1 @@ +../qemuxml2argvdata/video-qxl-resolution.xml \ No newline at end of file -- 2.26.2
