--- tests/qemuhotplugtest.c | 6 +++--- .../qemuhotplug-console-virtio.xml | 0 .../qemuhotplug-disk-cdrom-nochange.xml | 0 .../qemuhotplug-disk-scsi-2.xml | 0 .../qemuhotplug-disk-scsi.xml | 0 .../qemuhotplug-disk-usb.xml | 0 .../qemuhotplug-disk-virtio.xml | 0 .../qemuhotplug-graphics-spice-listen-network-password.xml | 0 .../qemuhotplug-graphics-spice-listen.xml | 0 .../qemuhotplug-graphics-spice-nochange.xml | 0 .../qemuhotplug-graphics-spice-timeout-nochange.xml | 0 .../qemuhotplug-graphics-spice-timeout-password.xml | 0 .../qemuhotplug-qemu-agent-detach.xml | 0 .../qemuhotplug-qemu-agent.xml | 0 .../qemuhotplug-base+qemu-agent-detach.xml | 0 .../qemuhotplug-base+qemu-agent.xml | 0 .../qemuhotplug-base-live+disk-scsi.xml | 0 .../qemuhotplug-base-live+disk-usb.xml | 0 .../qemuhotplug-base-live+disk-virtio.xml | 0 .../qemuhotplug-base-live+qemu-agent-detach.xml | 0 .../qemuhotplug-base-live+qemu-agent.xml | 0 .../qemuhotplug-base-live.xml | 0 .../qemuhotplug-base-with-scsi-controller-live+disk-scsi-2.xml | 0 .../qemuhotplug-base-with-scsi-controller-live.xml | 0 .../qemuhotplug-base-without-scsi-controller-live+disk-scsi-2.xml | 0 .../qemuhotplug-base-without-scsi-controller-live.xml | 0 .../qemuhotplug-console-compat-2-live+console-virtio.xml | 0 .../qemuhotplug-console-compat-2-live.xml | 0 .../qemuhotplug-disk-cdrom.xml | 0 .../qemuhotplug-graphics-spice-listen-network.xml | 0 .../qemuhotplug-graphics-spice-timeout.xml | 0 .../qemuhotplug-graphics-spice.xml | 0 32 files changed, 3 insertions(+), 3 deletions(-) rename tests/{qemuhotplugtestdata => qemuhotplugtestdevices}/qemuhotplug-console-virtio.xml (100%) rename tests/{qemuhotplugtestdata => qemuhotplugtestdevices}/qemuhotplug-disk-cdrom-nochange.xml (100%) rename tests/{qemuhotplugtestdata => qemuhotplugtestdevices}/qemuhotplug-disk-scsi-2.xml (100%) rename tests/{qemuhotplugtestdata => qemuhotplugtestdevices}/qemuhotplug-disk-scsi.xml (100%) rename tests/{qemuhotplugtestdata => qemuhotplugtestdevices}/qemuhotplug-disk-usb.xml (100%) rename tests/{qemuhotplugtestdata => qemuhotplugtestdevices}/qemuhotplug-disk-virtio.xml (100%) rename tests/{qemuhotplugtestdata => qemuhotplugtestdevices}/qemuhotplug-graphics-spice-listen-network-password.xml (100%) rename tests/{qemuhotplugtestdata => qemuhotplugtestdevices}/qemuhotplug-graphics-spice-listen.xml (100%) rename tests/{qemuhotplugtestdata => qemuhotplugtestdevices}/qemuhotplug-graphics-spice-nochange.xml (100%) rename tests/{qemuhotplugtestdata => qemuhotplugtestdevices}/qemuhotplug-graphics-spice-timeout-nochange.xml (100%) rename tests/{qemuhotplugtestdata => qemuhotplugtestdevices}/qemuhotplug-graphics-spice-timeout-password.xml (100%) rename tests/{qemuhotplugtestdata => qemuhotplugtestdevices}/qemuhotplug-qemu-agent-detach.xml (100%) rename tests/{qemuhotplugtestdata => qemuhotplugtestdevices}/qemuhotplug-qemu-agent.xml (100%) rename tests/{qemuhotplugtestdata => qemuhotplugtestdomains}/qemuhotplug-base+qemu-agent-detach.xml (100%) rename tests/{qemuhotplugtestdata => qemuhotplugtestdomains}/qemuhotplug-base+qemu-agent.xml (100%) rename tests/{qemuhotplugtestdata => qemuhotplugtestdomains}/qemuhotplug-base-live+disk-scsi.xml (100%) rename tests/{qemuhotplugtestdata => qemuhotplugtestdomains}/qemuhotplug-base-live+disk-usb.xml (100%) rename tests/{qemuhotplugtestdata => qemuhotplugtestdomains}/qemuhotplug-base-live+disk-virtio.xml (100%) rename tests/{qemuhotplugtestdata => qemuhotplugtestdomains}/qemuhotplug-base-live+qemu-agent-detach.xml (100%) rename tests/{qemuhotplugtestdata => qemuhotplugtestdomains}/qemuhotplug-base-live+qemu-agent.xml (100%) rename tests/{qemuhotplugtestdata => qemuhotplugtestdomains}/qemuhotplug-base-live.xml (100%) rename tests/{qemuhotplugtestdata => qemuhotplugtestdomains}/qemuhotplug-base-with-scsi-controller-live+disk-scsi-2.xml (100%) rename tests/{qemuhotplugtestdata => qemuhotplugtestdomains}/qemuhotplug-base-with-scsi-controller-live.xml (100%) rename tests/{qemuhotplugtestdata => qemuhotplugtestdomains}/qemuhotplug-base-without-scsi-controller-live+disk-scsi-2.xml (100%) rename tests/{qemuhotplugtestdata => qemuhotplugtestdomains}/qemuhotplug-base-without-scsi-controller-live.xml (100%) rename tests/{qemuhotplugtestdata => qemuhotplugtestdomains}/qemuhotplug-console-compat-2-live+console-virtio.xml (100%) rename tests/{qemuhotplugtestdata => qemuhotplugtestdomains}/qemuhotplug-console-compat-2-live.xml (100%) rename tests/{qemuhotplugtestdata => qemuhotplugtestdomains}/qemuhotplug-disk-cdrom.xml (100%) rename tests/{qemuhotplugtestdata => qemuhotplugtestdomains}/qemuhotplug-graphics-spice-listen-network.xml (100%) rename tests/{qemuhotplugtestdata => qemuhotplugtestdomains}/qemuhotplug-graphics-spice-timeout.xml (100%) rename tests/{qemuhotplugtestdata => qemuhotplugtestdomains}/qemuhotplug-graphics-spice.xml (100%) diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index 369d27e..f2e7567 100644 --- 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+qemu-agent-detach.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base+qemu-agent-detach.xml similarity index 100% rename from tests/qemuhotplugtestdata/qemuhotplug-base+qemu-agent-detach.xml rename to tests/qemuhotplugtestdomains/qemuhotplug-base+qemu-agent-detach.xml diff --git a/tests/qemuhotplugtestdata/qemuhotplug-base+qemu-agent.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base+qemu-agent.xml similarity index 100% rename from tests/qemuhotplugtestdata/qemuhotplug-base+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/qemuhotplugtestdata/qemuhotplug-base-live+qemu-agent-detach.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+qemu-agent-detach.xml similarity index 100% rename from tests/qemuhotplugtestdata/qemuhotplug-base-live+qemu-agent-detach.xml rename to tests/qemuhotplugtestdomains/qemuhotplug-base-live+qemu-agent-detach.xml diff --git a/tests/qemuhotplugtestdata/qemuhotplug-base-live+qemu-agent.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+qemu-agent.xml similarity index 100% rename from tests/qemuhotplugtestdata/qemuhotplug-base-live+qemu-agent.xml rename to tests/qemuhotplugtestdomains/qemuhotplug-base-live+qemu-agent.xml 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 -- 2.7.4 (Apple Git-66)