qemuhotplugtest: Move domain and device XMLs to different directories

This way we can safely differentiate what XMLs contain whole domain
definitions and which contain just devices.  Thanks to that we can
test the domain XMLs in virschematest again.

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>

diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c
index 369d27eb0d2cdc3ce6b85eb202b637b100d48d55..f2e7567c8647b6705b246b4f703bd2ed18efa101 100644 (file)
--- a/tests/qemuhotplugtest.c
+++ b/tests/qemuhotplugtest.c
@@ -225,12 +225,12 @@ testQemuHotplug(const void *data)
     qemuMonitorTestPtr test_mon = NULL;
     qemuDomainObjPrivatePtr priv = NULL;
 
-    if (virAsprintf(&domain_filename, "%s/qemuhotplugtestdata/qemuhotplug-%s.xml",
+    if (virAsprintf(&domain_filename, "%s/qemuhotplugtestdomains/qemuhotplug-%s.xml",
                     abs_srcdir, test->domain_filename) < 0 ||
-        virAsprintf(&device_filename, "%s/qemuhotplugtestdata/qemuhotplug-%s.xml",
+        virAsprintf(&device_filename, "%s/qemuhotplugtestdevices/qemuhotplug-%s.xml",
                     abs_srcdir, test->device_filename) < 0 ||
         virAsprintf(&result_filename,
-                    "%s/qemuhotplugtestdata/qemuhotplug-%s+%s.xml",
+                    "%s/qemuhotplugtestdomains/qemuhotplug-%s+%s.xml",
                     abs_srcdir, test->domain_filename,
                     test->device_filename) < 0)
         goto cleanup;

diff --git a/tests/qemuhotplugtestdata/qemuhotplug-console-virtio.xml b/tests/qemuhotplugtestdevices/qemuhotplug-console-virtio.xml
similarity index 100%
rename from tests/qemuhotplugtestdata/qemuhotplug-console-virtio.xml
rename to tests/qemuhotplugtestdevices/qemuhotplug-console-virtio.xml

diff --git a/tests/qemuhotplugtestdata/qemuhotplug-disk-cdrom-nochange.xml b/tests/qemuhotplugtestdevices/qemuhotplug-disk-cdrom-nochange.xml
similarity index 100%
rename from tests/qemuhotplugtestdata/qemuhotplug-disk-cdrom-nochange.xml
rename to tests/qemuhotplugtestdevices/qemuhotplug-disk-cdrom-nochange.xml

diff --git a/tests/qemuhotplugtestdata/qemuhotplug-disk-scsi-2.xml b/tests/qemuhotplugtestdevices/qemuhotplug-disk-scsi-2.xml
similarity index 100%
rename from tests/qemuhotplugtestdata/qemuhotplug-disk-scsi-2.xml
rename to tests/qemuhotplugtestdevices/qemuhotplug-disk-scsi-2.xml

diff --git a/tests/qemuhotplugtestdata/qemuhotplug-disk-scsi.xml b/tests/qemuhotplugtestdevices/qemuhotplug-disk-scsi.xml
similarity index 100%
rename from tests/qemuhotplugtestdata/qemuhotplug-disk-scsi.xml
rename to tests/qemuhotplugtestdevices/qemuhotplug-disk-scsi.xml

diff --git a/tests/qemuhotplugtestdata/qemuhotplug-disk-usb.xml b/tests/qemuhotplugtestdevices/qemuhotplug-disk-usb.xml
similarity index 100%
rename from tests/qemuhotplugtestdata/qemuhotplug-disk-usb.xml
rename to tests/qemuhotplugtestdevices/qemuhotplug-disk-usb.xml

diff --git a/tests/qemuhotplugtestdata/qemuhotplug-disk-virtio.xml b/tests/qemuhotplugtestdevices/qemuhotplug-disk-virtio.xml
similarity index 100%
rename from tests/qemuhotplugtestdata/qemuhotplug-disk-virtio.xml
rename to tests/qemuhotplugtestdevices/qemuhotplug-disk-virtio.xml

diff --git a/tests/qemuhotplugtestdata/qemuhotplug-graphics-spice-listen-network-password.xml b/tests/qemuhotplugtestdevices/qemuhotplug-graphics-spice-listen-network-password.xml
similarity index 100%
rename from tests/qemuhotplugtestdata/qemuhotplug-graphics-spice-listen-network-password.xml
rename to tests/qemuhotplugtestdevices/qemuhotplug-graphics-spice-listen-network-password.xml

diff --git a/tests/qemuhotplugtestdata/qemuhotplug-graphics-spice-listen.xml b/tests/qemuhotplugtestdevices/qemuhotplug-graphics-spice-listen.xml
similarity index 100%
rename from tests/qemuhotplugtestdata/qemuhotplug-graphics-spice-listen.xml
rename to tests/qemuhotplugtestdevices/qemuhotplug-graphics-spice-listen.xml

diff --git a/tests/qemuhotplugtestdata/qemuhotplug-graphics-spice-nochange.xml b/tests/qemuhotplugtestdevices/qemuhotplug-graphics-spice-nochange.xml
similarity index 100%
rename from tests/qemuhotplugtestdata/qemuhotplug-graphics-spice-nochange.xml
rename to tests/qemuhotplugtestdevices/qemuhotplug-graphics-spice-nochange.xml

diff --git a/tests/qemuhotplugtestdata/qemuhotplug-graphics-spice-timeout-nochange.xml b/tests/qemuhotplugtestdevices/qemuhotplug-graphics-spice-timeout-nochange.xml
similarity index 100%
rename from tests/qemuhotplugtestdata/qemuhotplug-graphics-spice-timeout-nochange.xml
rename to tests/qemuhotplugtestdevices/qemuhotplug-graphics-spice-timeout-nochange.xml

diff --git a/tests/qemuhotplugtestdata/qemuhotplug-graphics-spice-timeout-password.xml b/tests/qemuhotplugtestdevices/qemuhotplug-graphics-spice-timeout-password.xml
similarity index 100%
rename from tests/qemuhotplugtestdata/qemuhotplug-graphics-spice-timeout-password.xml
rename to tests/qemuhotplugtestdevices/qemuhotplug-graphics-spice-timeout-password.xml

diff --git a/tests/qemuhotplugtestdata/qemuhotplug-qemu-agent-detach.xml b/tests/qemuhotplugtestdevices/qemuhotplug-qemu-agent-detach.xml
similarity index 100%
rename from tests/qemuhotplugtestdata/qemuhotplug-qemu-agent-detach.xml
rename to tests/qemuhotplugtestdevices/qemuhotplug-qemu-agent-detach.xml

diff --git a/tests/qemuhotplugtestdata/qemuhotplug-qemu-agent.xml b/tests/qemuhotplugtestdevices/qemuhotplug-qemu-agent.xml
similarity index 100%
rename from tests/qemuhotplugtestdata/qemuhotplug-qemu-agent.xml
rename to tests/qemuhotplugtestdevices/qemuhotplug-qemu-agent.xml

diff --git a/tests/qemuhotplugtestdata/qemuhotplug-base-live+qemu-agent-detach.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base+qemu-agent-detach.xml
similarity index 100%
rename from tests/qemuhotplugtestdata/qemuhotplug-base-live+qemu-agent-detach.xml
rename to tests/qemuhotplugtestdomains/qemuhotplug-base+qemu-agent-detach.xml

diff --git a/tests/qemuhotplugtestdata/qemuhotplug-base-live+qemu-agent.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base+qemu-agent.xml
similarity index 100%
rename from tests/qemuhotplugtestdata/qemuhotplug-base-live+qemu-agent.xml
rename to tests/qemuhotplugtestdomains/qemuhotplug-base+qemu-agent.xml

diff --git a/tests/qemuhotplugtestdata/qemuhotplug-base-live+disk-scsi.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-scsi.xml
similarity index 100%
rename from tests/qemuhotplugtestdata/qemuhotplug-base-live+disk-scsi.xml
rename to tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-scsi.xml

diff --git a/tests/qemuhotplugtestdata/qemuhotplug-base-live+disk-usb.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-usb.xml
similarity index 100%
rename from tests/qemuhotplugtestdata/qemuhotplug-base-live+disk-usb.xml
rename to tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-usb.xml

diff --git a/tests/qemuhotplugtestdata/qemuhotplug-base-live+disk-virtio.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-virtio.xml
similarity index 100%
rename from tests/qemuhotplugtestdata/qemuhotplug-base-live+disk-virtio.xml
rename to tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-virtio.xml

diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+qemu-agent-detach.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+qemu-agent-detach.xml
new file mode 100644 (file)
index 0000000..2c449f1
--- /dev/null
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+qemu-agent-detach.xml
@@ -0,0 +1,58 @@
+<domain type='kvm' id='7'>
+  <name>hotplug</name>
+  <uuid>d091ea82-29e6-2e34-3005-f02617b36e87</uuid>
+  <memory unit='KiB'>4194304</memory>
+  <currentMemory unit='KiB'>4194304</currentMemory>
+  <vcpu placement='static'>4</vcpu>
+  <os>
+    <type arch='x86_64' machine='pc'>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>
+  <devices>
+    <emulator>/usr/libexec/qemu-kvm</emulator>
+    <controller type='usb' index='0'>
+      <alias name='usb'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
+    </controller>
+    <controller type='ide' index='0'>
+      <alias name='ide'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
+    </controller>
+    <controller type='scsi' index='0' model='virtio-scsi'>
+      <alias name='scsi0'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
+    </controller>
+    <controller type='pci' index='0' model='pci-root'>
+      <alias name='pci'/>
+    </controller>
+    <controller type='virtio-serial' index='0'>
+      <alias name='virtio-serial0'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
+    </controller>
+    <channel type='unix'>
+      <source mode='bind' path='/var/lib/libvirt/qemu/channel/target/domain-7-hotplug/org.qemu.guest_agent.0'/>
+      <target type='virtio' name='org.qemu.guest_agent.0'/>
+      <alias name='channel0'/>
+      <address type='virtio-serial' controller='0' bus='0' port='1'/>
+    </channel>
+    <input type='mouse' bus='ps2'>
+      <alias name='input0'/>
+    </input>
+    <input type='keyboard' bus='ps2'>
+      <alias name='input1'/>
+    </input>
+    <memballoon model='none'>
+      <alias name='balloon0'/>
+    </memballoon>
+  </devices>
+  <seclabel type='none' model='none'/>
+</domain>

diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+qemu-agent.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+qemu-agent.xml
new file mode 100644 (file)
index 0000000..47fc970
--- /dev/null
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+qemu-agent.xml
@@ -0,0 +1,58 @@
+<domain type='kvm' id='7'>
+  <name>hotplug</name>
+  <uuid>d091ea82-29e6-2e34-3005-f02617b36e87</uuid>
+  <memory unit='KiB'>4194304</memory>
+  <currentMemory unit='KiB'>4194304</currentMemory>
+  <vcpu placement='static'>4</vcpu>
+  <os>
+    <type arch='x86_64' machine='pc'>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>
+  <devices>
+    <emulator>/usr/libexec/qemu-kvm</emulator>
+    <controller type='usb' index='0'>
+      <alias name='usb'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
+    </controller>
+    <controller type='ide' index='0'>
+      <alias name='ide'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
+    </controller>
+    <controller type='scsi' index='0' model='virtio-scsi'>
+      <alias name='scsi0'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
+    </controller>
+    <controller type='pci' index='0' model='pci-root'>
+      <alias name='pci'/>
+    </controller>
+    <controller type='virtio-serial' index='0'>
+      <alias name='virtio-serial0'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
+    </controller>
+    <channel type='unix'>
+      <source mode='bind' path='/tmp/channel/domain-7-hotplug/org.qemu.guest_agent.0'/>
+      <target type='virtio' name='org.qemu.guest_agent.0'/>
+      <alias name='channel0'/>
+      <address type='virtio-serial' controller='0' bus='0' port='1'/>
+    </channel>
+    <input type='mouse' bus='ps2'>
+      <alias name='input0'/>
+    </input>
+    <input type='keyboard' bus='ps2'>
+      <alias name='input1'/>
+    </input>
+    <memballoon model='none'>
+      <alias name='balloon0'/>
+    </memballoon>
+  </devices>
+  <seclabel type='none' model='none'/>
+</domain>

diff --git a/tests/qemuhotplugtestdata/qemuhotplug-base-live.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live.xml
similarity index 100%
rename from tests/qemuhotplugtestdata/qemuhotplug-base-live.xml
rename to tests/qemuhotplugtestdomains/qemuhotplug-base-live.xml

diff --git a/tests/qemuhotplugtestdata/qemuhotplug-base-with-scsi-controller-live+disk-scsi-2.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-with-scsi-controller-live+disk-scsi-2.xml
similarity index 100%
rename from tests/qemuhotplugtestdata/qemuhotplug-base-with-scsi-controller-live+disk-scsi-2.xml
rename to tests/qemuhotplugtestdomains/qemuhotplug-base-with-scsi-controller-live+disk-scsi-2.xml

diff --git a/tests/qemuhotplugtestdata/qemuhotplug-base-with-scsi-controller-live.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-with-scsi-controller-live.xml
similarity index 100%
rename from tests/qemuhotplugtestdata/qemuhotplug-base-with-scsi-controller-live.xml
rename to tests/qemuhotplugtestdomains/qemuhotplug-base-with-scsi-controller-live.xml

diff --git a/tests/qemuhotplugtestdata/qemuhotplug-base-without-scsi-controller-live+disk-scsi-2.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-without-scsi-controller-live+disk-scsi-2.xml
similarity index 100%
rename from tests/qemuhotplugtestdata/qemuhotplug-base-without-scsi-controller-live+disk-scsi-2.xml
rename to tests/qemuhotplugtestdomains/qemuhotplug-base-without-scsi-controller-live+disk-scsi-2.xml

diff --git a/tests/qemuhotplugtestdata/qemuhotplug-base-without-scsi-controller-live.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-without-scsi-controller-live.xml
similarity index 100%
rename from tests/qemuhotplugtestdata/qemuhotplug-base-without-scsi-controller-live.xml
rename to tests/qemuhotplugtestdomains/qemuhotplug-base-without-scsi-controller-live.xml

diff --git a/tests/qemuhotplugtestdata/qemuhotplug-console-compat-2-live+console-virtio.xml b/tests/qemuhotplugtestdomains/qemuhotplug-console-compat-2-live+console-virtio.xml
similarity index 100%
rename from tests/qemuhotplugtestdata/qemuhotplug-console-compat-2-live+console-virtio.xml
rename to tests/qemuhotplugtestdomains/qemuhotplug-console-compat-2-live+console-virtio.xml

diff --git a/tests/qemuhotplugtestdata/qemuhotplug-console-compat-2-live.xml b/tests/qemuhotplugtestdomains/qemuhotplug-console-compat-2-live.xml
similarity index 100%
rename from tests/qemuhotplugtestdata/qemuhotplug-console-compat-2-live.xml
rename to tests/qemuhotplugtestdomains/qemuhotplug-console-compat-2-live.xml

diff --git a/tests/qemuhotplugtestdata/qemuhotplug-disk-cdrom.xml b/tests/qemuhotplugtestdomains/qemuhotplug-disk-cdrom.xml
similarity index 100%
rename from tests/qemuhotplugtestdata/qemuhotplug-disk-cdrom.xml
rename to tests/qemuhotplugtestdomains/qemuhotplug-disk-cdrom.xml

diff --git a/tests/qemuhotplugtestdata/qemuhotplug-graphics-spice-listen-network.xml b/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice-listen-network.xml
similarity index 100%
rename from tests/qemuhotplugtestdata/qemuhotplug-graphics-spice-listen-network.xml
rename to tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice-listen-network.xml

diff --git a/tests/qemuhotplugtestdata/qemuhotplug-graphics-spice-timeout.xml b/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice-timeout.xml
similarity index 100%
rename from tests/qemuhotplugtestdata/qemuhotplug-graphics-spice-timeout.xml
rename to tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice-timeout.xml

diff --git a/tests/qemuhotplugtestdata/qemuhotplug-graphics-spice.xml b/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice.xml
similarity index 100%
rename from tests/qemuhotplugtestdata/qemuhotplug-graphics-spice.xml
rename to tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice.xml

diff --git a/tests/virschematest.c b/tests/virschematest.c
index c372c4373dc6d6e4532a3397aa64a46c4ba836dd..a1901e753a5812305c368a6e992c329eb359f5bf 100644 (file)
--- a/tests/virschematest.c
+++ b/tests/virschematest.c
@@ -166,7 +166,8 @@ mymain(void)
             "qemuxml2argvdata", "sexpr2xmldata", "xmconfigdata",
             "xml2sexprdata", "qemuxml2xmloutdata", "lxcxml2xmldata",
             "lxcxml2xmloutdata", "bhyvexml2argvdata", "genericxml2xmlindata",
-            "genericxml2xmloutdata", "xlconfigdata");
+            "genericxml2xmloutdata", "xlconfigdata",
+            "qemuhotplugtestdomains");
     DO_TEST("domaincaps.rng", "domaincapsschemadata");
     DO_TEST("domainsnapshot.rng", "domainsnapshotxml2xmlin",
             "domainsnapshotxml2xmlout");