[PATCH 02/24] qemuxml2argvdata: Remove unused 'xml' files

Peter Krempa pkrempa at redhat.com
Wed Apr 7 15:09:25 UTC 2021


The files are no longer referenced by either qemuxml2argvtest or
qemuxml2xmltest. Remove them.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 tests/qemuxml2argvdata/console-compat-2.xml  | 103 -------------------
 tests/qemuxml2argvdata/hostdev-scsi-boot.xml |  34 ------
 tests/qemuxml2argvdata/video-invalid.xml     |  30 ------
 3 files changed, 167 deletions(-)
 delete mode 100644 tests/qemuxml2argvdata/console-compat-2.xml
 delete mode 100644 tests/qemuxml2argvdata/hostdev-scsi-boot.xml
 delete mode 100644 tests/qemuxml2argvdata/video-invalid.xml

diff --git a/tests/qemuxml2argvdata/console-compat-2.xml b/tests/qemuxml2argvdata/console-compat-2.xml
deleted file mode 100644
index 7b35709fa9..0000000000
--- a/tests/qemuxml2argvdata/console-compat-2.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<domain type='kvm'>
-  <name>f17</name>
-  <uuid>a1cd52eb-d37f-4717-fc6e-972f0774f4c9</uuid>
-  <memory unit='KiB'>1048576</memory>
-  <currentMemory unit='KiB'>1048576</currentMemory>
-  <vcpu placement='static'>1</vcpu>
-  <resource>
-    <partition>/machine</partition>
-  </resource>
-  <os>
-    <type arch='x86_64' machine='pc-i440fx-1.4'>hvm</type>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <pae/>
-  </features>
-  <clock offset='utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <pm>
-    <suspend-to-mem enabled='yes'/>
-    <suspend-to-disk enabled='yes'/>
-  </pm>
-  <devices>
-    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <disk type='file' device='disk'>
-      <driver name='qemu' type='qcow2' cache='none'/>
-      <source file='/var/lib/libvirt/images/f17.qcow2'/>
-      <target dev='vda' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
-    </disk>
-    <disk type='file' device='cdrom'>
-      <driver name='qemu' type='raw' cache='none'/>
-      <source file='/home/user/tmp/Fedora-17-x86_64-Live-KDE.iso'/>
-      <target dev='hdc' bus='ide'/>
-      <readonly/>
-      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
-    </disk>
-    <controller type='ide' index='0'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
-    </controller>
-    <controller type='usb' index='0'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
-    </controller>
-    <controller type='pci' index='0' model='pci-root'/>
-    <controller type='virtio-serial' index='0'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/>
-    </controller>
-    <interface type='network'>
-      <mac address='52:54:00:ea:35:6f'/>
-      <source network='default'/>
-      <bandwidth>
-        <inbound average='4000' peak='8000' floor='200' burst='1024'/>
-        <outbound average='4000' peak='8000' burst='1024'/>
-      </bandwidth>
-      <model type='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
-    </interface>
-    <serial type='pty'>
-      <target type='isa-serial' port='0'/>
-    </serial>
-    <serial type='pty'>
-      <target port='0'/>
-    </serial>
-    <serial type='tcp'>
-      <source mode='bind' host='0.0.0.0' service='2445'/>
-      <protocol type='raw'/>
-      <target port='1'/>
-    </serial>
-    <console type='pty'>
-      <target type='serial' port='0'/>
-    </console>
-    <channel type='unix'>
-      <source mode='bind' path='/var/lib/libvirt/qemu/f17x86_64.agent'/>
-      <target type='virtio' name='org.qemu.guest_agent.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='1'/>
-    </channel>
-    <input type='tablet' bus='usb'>
-      <address type='usb' bus='0' port='1'/>
-    </input>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <graphics type='vnc' port='-1' autoport='yes' listen='0.0.0.0'>
-      <listen type='address' address='0.0.0.0'/>
-    </graphics>
-    <sound model='ich6'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
-    </sound>
-    <video>
-      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
-    </video>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/>
-    </memballoon>
-  </devices>
-  <seclabel type='static' model='dac' relabel='no'>
-    <label>root:root</label>
-  </seclabel>
-</domain>
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-boot.xml b/tests/qemuxml2argvdata/hostdev-scsi-boot.xml
deleted file mode 100644
index 8762f57c2b..0000000000
--- a/tests/qemuxml2argvdata/hostdev-scsi-boot.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<domain type='qemu'>
-  <name>QEMUGuest2</name>
-  <uuid>c7a5fdbd-edaf-9466-926a-d65c16db1809</uuid>
-  <memory unit='KiB'>219100</memory>
-  <currentMemory unit='KiB'>219100</currentMemory>
-  <vcpu placement='static'>1</vcpu>
-  <os>
-    <type arch='i686' machine='pc'>hvm</type>
-  </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'>
-      <source dev='/dev/HostVG/QEMUGuest2'/>
-      <target dev='hda' bus='ide'/>
-      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
-    </disk>
-    <controller type='scsi' index='0' model='virtio-scsi'/>
-    <controller type='usb' index='0'/>
-    <controller type='ide' index='0'/>
-    <hostdev mode='subsystem' type='scsi' managed='yes'>
-      <source>
-        <adapter name='scsi_host0'/>
-        <address bus='0' target='0' unit='0'/>
-      </source>
-      <boot order='1'/>
-      <address type='drive' controller='0' bus='0' target='4' unit='8'/>
-    </hostdev>
-    <memballoon model='virtio'/>
-  </devices>
-</domain>
diff --git a/tests/qemuxml2argvdata/video-invalid.xml b/tests/qemuxml2argvdata/video-invalid.xml
deleted file mode 100644
index 9f24b7a096..0000000000
--- a/tests/qemuxml2argvdata/video-invalid.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<domain type='qemu'>
-  <name>QEMUGuest1</name>
-  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
-  <memory unit='KiB'>219100</memory>
-  <currentMemory unit='KiB'>219100</currentMemory>
-  <vcpu placement='static' cpuset='1-4,8-20,525'>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'>
-      <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'/>
-    <controller type='ide' index='0'/>
-    <controller type='pci' index='0' model='pci-root'/>
-    <video>
-      <model type='qxl' ram='-1' vram='-1' vgamem='-1' heads='-1'/>
-    </video>
-    <memballoon model='virtio'/>
-  </devices>
-</domain>
-- 
2.30.2




More information about the libvir-list mailing list