Remove xencaps tests and data files

Signed-off-by: Jim Fehlig <jfehlig@suse.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/tests/Makefile.am b/tests/Makefile.am
index e6b85afa65cba5919e8dcad6b53e6678090e81b6..24dbb56cacf26c94d6d20d8ebf20099827ca117b 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -161,7 +161,6 @@ EXTRA_DIST = \
        virusbtestdata \
        vmwareverdata \
        vmx2xmldata \
-       xencapsdata \
        xlconfigdata \
        xmconfigdata \
        xml2sexprdata \
@@ -272,10 +271,6 @@ endif WITH_SECDRIVER_SELINUX
 ssh_SOURCES = ssh.c
 ssh_LDADD = $(COVERAGE_LDFLAGS)
 
-if WITH_XEN
-test_programs += xencapstest
-endif WITH_XEN
-
 if WITH_LIBXL
 test_programs += xlconfigtest xml2sexprtest sexpr2xmltest \
        xmconfigtest libxlxml2domconfigtest
@@ -498,18 +493,6 @@ sockettest_SOURCES = \
        testutils.c testutils.h
 sockettest_LDADD = $(LDADDS)
 
-if WITH_XEN
-xen_LDADDS = ../src/libvirt_driver_xen_impl.la
-xen_LDADDS += $(LDADDS)
-
-xencapstest_SOURCES = \
-       xencapstest.c testutils.h testutils.c
-xencapstest_LDADD = $(xen_LDADDS)
-
-else ! WITH_XEN
-EXTRA_DIST += xencapstest.c testutilsxen.c testutilsxen.h
-endif ! WITH_XEN
-
 if WITH_LIBXL
 libxl_LDADDS = ../src/libvirt_driver_libxl_impl.la
 if WITH_NETWORK
@@ -984,9 +967,6 @@ endif WITH_LXC
 if WITH_QEMU
 vircapstest_SOURCES += testutilsqemu.c testutilsqemu.h
 endif WITH_QEMU
-if WITH_XEN
-vircapstest_SOURCES += testutilsxen.c testutilsxen.h
-endif WITH_XEN
 vircapstest_LDADD = $(qemu_LDADDS) $(LDADDS)
 
 domaincapsmock_la_SOURCES = domaincapsmock.c

diff --git a/tests/testutilsxen.c b/tests/testutilsxen.c
index 4328441b79fa9ebaeee60689f96c3156ecd84471..c08ec4a6ec230ea45264be9a3b6f13e13ece67d6 100644 (file)
--- a/tests/testutilsxen.c
+++ b/tests/testutilsxen.c
@@ -7,70 +7,6 @@
 #include "testutilshostcpus.h"
 #include "domain_conf.h"
 
-virCapsPtr testXenCapsInit(void)
-{
-    struct utsname utsname;
-    virCapsPtr caps;
-    virCapsGuestPtr guest;
-    virCapsGuestMachinePtr *machines;
-    int nmachines;
-    static const char *const x86_machines[] = {
-        "xenfv"
-    };
-    static const char *const xen_machines[] = {
-        "xenpv"
-    };
-
-    uname(&utsname);
-    if ((caps = virCapabilitiesNew(VIR_ARCH_I686,
-                                   false, false)) == NULL)
-        return NULL;
-
-    nmachines = ARRAY_CARDINALITY(x86_machines);
-    if ((machines = virCapabilitiesAllocMachines(x86_machines, nmachines)) == NULL)
-        goto cleanup;
-
-    if ((guest = virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_I686,
-                                         "/usr/lib/xen/bin/qemu-dm", NULL,
-                                         nmachines, machines)) == NULL)
-        goto cleanup;
-    machines = NULL;
-
-    if (virCapabilitiesAddGuestDomain(guest,
-                                      VIR_DOMAIN_VIRT_XEN,
-                                      NULL,
-                                      NULL,
-                                      0,
-                                      NULL) == NULL)
-        goto cleanup;
-
-    nmachines = ARRAY_CARDINALITY(xen_machines);
-    if ((machines = virCapabilitiesAllocMachines(xen_machines, nmachines)) == NULL)
-        goto cleanup;
-
-    if ((guest = virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_XEN, VIR_ARCH_I686,
-                                         "/usr/lib/xen/bin/qemu-dm", NULL,
-                                         nmachines, machines)) == NULL)
-        goto cleanup;
-    machines = NULL;
-
-    if (virCapabilitiesAddGuestDomain(guest,
-                                      VIR_DOMAIN_VIRT_XEN,
-                                      NULL,
-                                      NULL,
-                                      0,
-                                      NULL) == NULL)
-        goto cleanup;
-
-    return caps;
-
- cleanup:
-    virCapabilitiesFreeMachines(machines, nmachines);
-    virObjectUnref(caps);
-    return NULL;
-}
-
-
 virCapsPtr
 testXLInitCaps(void)
 {

diff --git a/tests/testutilsxen.h b/tests/testutilsxen.h
index 2facf5e5afa5af4239f5fc734b72af80f0c7021b..c5ccb6d4713b01b78ff7ebd23ee25e4c7c4fbed5 100644 (file)
--- a/tests/testutilsxen.h
+++ b/tests/testutilsxen.h
@@ -6,8 +6,6 @@
 #  include "libxl/libxl_capabilities.h"
 # endif
 
-virCapsPtr testXenCapsInit(void);
-
 virCapsPtr testXLInitCaps(void);
 
 #endif /* _TESTUTILSXEN_H_ */

diff --git a/tests/vircapstest.c b/tests/vircapstest.c
index 05ec802f35a2a281f18ddf6e568b29ad1b381d75..664b7da1433b5add023f402bdecdd8974933f2a1 100644 (file)
--- a/tests/vircapstest.c
+++ b/tests/vircapstest.c
@@ -22,7 +22,6 @@
 
 #include "testutils.h"
 #include "testutilslxc.h"
-#include "testutilsxen.h"
 #include "testutilsqemu.h"
 #include "capabilities.h"
 #include "virbitmap.h"
@@ -264,34 +263,6 @@ test_virCapsDomainDataLookupQEMU(const void *data ATTRIBUTE_UNUSED)
 }
 #endif /* WITH_QEMU */
 
-#ifdef WITH_XEN
-static int
-test_virCapsDomainDataLookupXen(const void *data ATTRIBUTE_UNUSED)
-{
-    int ret = -1;
-    virCapsPtr caps = NULL;
-
-    if (!(caps = testXenCapsInit())) {
-        ret = -1;
-        goto out;
-    }
-
-    CAPSCOMP(-1, VIR_ARCH_NONE, VIR_DOMAIN_VIRT_NONE, NULL, NULL,
-        VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_I686, VIR_DOMAIN_VIRT_XEN,
-        "/usr/lib/xen/bin/qemu-dm", "xenfv");
-    CAPSCOMP(VIR_DOMAIN_OSTYPE_XEN, VIR_ARCH_NONE, VIR_DOMAIN_VIRT_NONE, NULL, NULL,
-        VIR_DOMAIN_OSTYPE_XEN, VIR_ARCH_I686, VIR_DOMAIN_VIRT_XEN,
-        "/usr/lib/xen/bin/qemu-dm", "xenpv");
-
-    CAPS_EXPECT_ERR(VIR_DOMAIN_OSTYPE_XEN, VIR_ARCH_NONE, VIR_DOMAIN_VIRT_NONE, NULL, "xenfv");
-
-    ret = 0;
- out:
-    virObjectUnref(caps);
-    return ret;
-}
-#endif /* WITH_XEN */
-
 #ifdef WITH_LXC
 static int
 test_virCapsDomainDataLookupLXC(const void *data ATTRIBUTE_UNUSED)
@@ -330,11 +301,6 @@ mymain(void)
                    test_virCapsDomainDataLookupQEMU, NULL) < 0)
         ret = -1;
 #endif
-#ifdef WITH_XEN
-    if (virTestRun("virCapsDomainDataLookupXen",
-                   test_virCapsDomainDataLookupXen, NULL) < 0)
-        ret = -1;
-#endif
 #ifdef WITH_LXC
     if (virTestRun("virCapsDomainDataLookupLXC",
                    test_virCapsDomainDataLookupLXC, NULL) < 0)

diff --git a/tests/virdrivermoduletest.c b/tests/virdrivermoduletest.c
index 95e946d492f1192f5806f70f0d23979a577385ba..6c63ecd52bcd05699e71851bc49e6869ede00fcf 100644 (file)
--- a/tests/virdrivermoduletest.c
+++ b/tests/virdrivermoduletest.c
@@ -82,9 +82,6 @@ mymain(void)
 #ifdef WITH_NWFILTER
     TEST("nwfilter");
 #endif
-#ifdef WITH_XEN
-    TEST("xen");
-#endif
 #ifdef WITH_LIBXL
     TEST("libxl");
 #endif

diff --git a/tests/virschematest.c b/tests/virschematest.c
index f1d11437e0eac11f2abc88ea813e78d9b8290f9f..2d35833919437787d68201f459ef405e2ddacc60 100644 (file)
--- a/tests/virschematest.c
+++ b/tests/virschematest.c
@@ -215,8 +215,7 @@ mymain(void)
         } \
     } while (0)
 
-    DO_TEST_DIR("capability.rng", "capabilityschemadata", "xencapsdata",
-                "vircaps2xmldata");
+    DO_TEST_DIR("capability.rng", "capabilityschemadata", "vircaps2xmldata");
     DO_TEST_DIR("domain.rng", "domainschemadata", "qemuargv2xmldata",
                 "qemuxml2argvdata", "sexpr2xmldata", "xmconfigdata",
                 "xml2sexprdata", "qemuxml2xmloutdata", "lxcxml2xmldata",

diff --git a/tests/xencapsdata/xen-i686-pae-hvm.caps b/tests/xencapsdata/xen-i686-pae-hvm.caps
deleted file mode 100644 (file)
index 904b67f..0000000
--- a/tests/xencapsdata/xen-i686-pae-hvm.caps
+++ /dev/null
@@ -1 +0,0 @@
-xen-3.0-x86_32p hvm-3.0-x86_32 hvm-3.0-x86_32p

diff --git a/tests/xencapsdata/xen-i686-pae-hvm.cpuinfo b/tests/xencapsdata/xen-i686-pae-hvm.cpuinfo
deleted file mode 100644 (file)
index 8b4775f..0000000
--- a/tests/xencapsdata/xen-i686-pae-hvm.cpuinfo
+++ /dev/null
@@ -1,37 +0,0 @@
-processor      : 0
-vendor_id      : GenuineIntel
-cpu family     : 6
-model          : 15
-model name     : Intel(R) Core(TM)2 CPU         T7600  @ 2.33GHz
-stepping       : 6
-cpu MHz                : 2327.560
-cache size     : 4096 KB
-fdiv_bug       : no
-hlt_bug                : no
-f00f_bug       : no
-coma_bug       : no
-fpu            : yes
-fpu_exception  : yes
-cpuid level    : 10
-wp             : yes
-flags          : fpu tsc msr pae mce cx8 apic mtrr mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe lm constant_tsc pni monitor ds_cpl vmx est tm2 cx16 xtpr lahf_lm
-bogomips       : 5821.44
-
-processor      : 1
-vendor_id      : GenuineIntel
-cpu family     : 6
-model          : 15
-model name     : Intel(R) Core(TM)2 CPU         T7600  @ 2.33GHz
-stepping       : 6
-cpu MHz                : 2327.560
-cache size     : 4096 KB
-fdiv_bug       : no
-hlt_bug                : no
-f00f_bug       : no
-coma_bug       : no
-fpu            : yes
-fpu_exception  : yes
-cpuid level    : 10
-wp             : yes
-flags          : fpu tsc msr pae mce cx8 apic mtrr mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe lm constant_tsc pni monitor ds_cpl vmx est tm2 cx16 xtpr lahf_lm
-bogomips       : 5821.44

diff --git a/tests/xencapsdata/xen-i686-pae-hvm.xml b/tests/xencapsdata/xen-i686-pae-hvm.xml
deleted file mode 100644 (file)
index cf6a1de..0000000
--- a/tests/xencapsdata/xen-i686-pae-hvm.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<capabilities>
-
-  <host>
-    <cpu>
-      <arch>i686</arch>
-      <features>
-        <vmx/>
-      </features>
-    </cpu>
-    <power_management/>
-    <migration_features>
-      <live/>
-      <uri_transports>
-        <uri_transport>xenmigr</uri_transport>
-      </uri_transports>
-    </migration_features>
-  </host>
-
-  <guest>
-    <os_type>xen</os_type>
-    <arch name='i686'>
-      <wordsize>32</wordsize>
-      <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
-      <machine>xenpv</machine>
-      <domain type='xen'/>
-    </arch>
-    <features>
-      <pae/>
-    </features>
-  </guest>
-
-  <guest>
-    <os_type>hvm</os_type>
-    <arch name='i686'>
-      <wordsize>32</wordsize>
-      <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
-      <loader>/usr/lib/xen/boot/hvmloader</loader>
-      <machine>xenfv</machine>
-      <domain type='xen'/>
-    </arch>
-    <features>
-      <pae/>
-      <nonpae/>
-      <acpi default='on' toggle='yes'/>
-      <apic default='on' toggle='yes'/>
-    </features>
-  </guest>
-
-</capabilities>

diff --git a/tests/xencapsdata/xen-i686-pae.caps b/tests/xencapsdata/xen-i686-pae.caps
deleted file mode 100644 (file)
index 886855c..0000000
--- a/tests/xencapsdata/xen-i686-pae.caps
+++ /dev/null
@@ -1 +0,0 @@
-xen-3.0-x86_32p

diff --git a/tests/xencapsdata/xen-i686-pae.cpuinfo b/tests/xencapsdata/xen-i686-pae.cpuinfo
deleted file mode 100644 (file)
index 4b2fb66..0000000
--- a/tests/xencapsdata/xen-i686-pae.cpuinfo
+++ /dev/null
@@ -1,18 +0,0 @@
-processor      : 0
-vendor_id      : GenuineIntel
-cpu family     : 6
-model          : 15
-model name     : Intel(R) Core(TM)2 CPU         T7600  @ 2.33GHz
-stepping       : 6
-cpu MHz                : 2327.560
-cache size     : 4096 KB
-fdiv_bug       : no
-hlt_bug                : no
-f00f_bug       : no
-coma_bug       : no
-fpu            : yes
-fpu_exception  : yes
-cpuid level    : 10
-wp             : yes
-flags          : fpu tsc msr pae mce cx8 apic mtrr mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe lm constant_tsc pni monitor ds_cpl vmx est tm2 cx16 xtpr lahf_lm
-bogomips       : 5821.44

diff --git a/tests/xencapsdata/xen-i686-pae.xml b/tests/xencapsdata/xen-i686-pae.xml
deleted file mode 100644 (file)
index c917fbe..0000000
--- a/tests/xencapsdata/xen-i686-pae.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<capabilities>
-
-  <host>
-    <cpu>
-      <arch>i686</arch>
-      <features>
-        <vmx/>
-      </features>
-    </cpu>
-    <power_management/>
-    <migration_features>
-      <live/>
-      <uri_transports>
-        <uri_transport>xenmigr</uri_transport>
-      </uri_transports>
-    </migration_features>
-  </host>
-
-  <guest>
-    <os_type>xen</os_type>
-    <arch name='i686'>
-      <wordsize>32</wordsize>
-      <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
-      <machine>xenpv</machine>
-      <domain type='xen'/>
-    </arch>
-    <features>
-      <pae/>
-    </features>
-  </guest>
-
-</capabilities>

diff --git a/tests/xencapsdata/xen-i686.caps b/tests/xencapsdata/xen-i686.caps
deleted file mode 100644 (file)
index 8253fd3..0000000
--- a/tests/xencapsdata/xen-i686.caps
+++ /dev/null
@@ -1 +0,0 @@
-xen-3.0-x86_32

diff --git a/tests/xencapsdata/xen-i686.cpuinfo b/tests/xencapsdata/xen-i686.cpuinfo
deleted file mode 100644 (file)
index 5f9c8ef..0000000
--- a/tests/xencapsdata/xen-i686.cpuinfo
+++ /dev/null
@@ -1,18 +0,0 @@
-processor      : 0
-vendor_id      : GenuineIntel
-cpu family     : 6
-model          : 15
-model name     : Intel(R) Core(TM)2 CPU         T7600  @ 2.33GHz
-stepping       : 6
-cpu MHz                : 2327.560
-cache size     : 4096 KB
-fdiv_bug       : no
-hlt_bug                : no
-f00f_bug       : no
-coma_bug       : no
-fpu            : yes
-fpu_exception  : yes
-cpuid level    : 10
-wp             : yes
-flags          : fpu tsc msr mce cx8 apic mtrr mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe lm constant_tsc pni monitor
-bogomips       : 5821.44

diff --git a/tests/xencapsdata/xen-i686.xml b/tests/xencapsdata/xen-i686.xml
deleted file mode 100644 (file)
index 5771e2b..0000000
--- a/tests/xencapsdata/xen-i686.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<capabilities>
-
-  <host>
-    <cpu>
-      <arch>i686</arch>
-    </cpu>
-    <power_management/>
-    <migration_features>
-      <live/>
-      <uri_transports>
-        <uri_transport>xenmigr</uri_transport>
-      </uri_transports>
-    </migration_features>
-  </host>
-
-  <guest>
-    <os_type>xen</os_type>
-    <arch name='i686'>
-      <wordsize>32</wordsize>
-      <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
-      <machine>xenpv</machine>
-      <domain type='xen'/>
-    </arch>
-    <features>
-      <nonpae/>
-    </features>
-  </guest>
-
-</capabilities>

diff --git a/tests/xencapsdata/xen-ia64-be-hvm.caps b/tests/xencapsdata/xen-ia64-be-hvm.caps
deleted file mode 100644 (file)
index aec634d..0000000
--- a/tests/xencapsdata/xen-ia64-be-hvm.caps
+++ /dev/null
@@ -1 +0,0 @@
-xen-3.0-ia64be hvm-3.0-ia64be

diff --git a/tests/xencapsdata/xen-ia64-be-hvm.cpuinfo b/tests/xencapsdata/xen-ia64-be-hvm.cpuinfo
deleted file mode 100644 (file)
index 0b70bfd..0000000
--- a/tests/xencapsdata/xen-ia64-be-hvm.cpuinfo
+++ /dev/null
@@ -1,29 +0,0 @@
-processor  : 0
-vendor     : Xen/ia64
-arch       : IA-64
-family     : 32
-model      : 0
-revision   : 7
-archrev    : 0
-features   : branchlong, 16-byte atomic ops
-cpu number : 0
-cpu regs   : 4
-cpu MHz    : 1594.000670
-itc MHz    : 399.165930
-BogoMIPS   : 3186.68
-siblings   : 1
-
-processor  : 1
-vendor     : Xen/ia64
-arch       : IA-64
-family     : 32
-model      : 0
-revision   : 7
-archrev    : 0
-features   : branchlong, 16-byte atomic ops
-cpu number : 0
-cpu regs   : 4
-cpu MHz    : 1594.000670
-itc MHz    : 399.165930
-BogoMIPS   : 3186.68
-siblings   : 1

diff --git a/tests/xencapsdata/xen-ia64-be-hvm.xml b/tests/xencapsdata/xen-ia64-be-hvm.xml
deleted file mode 100644 (file)
index 19d23e9..0000000
--- a/tests/xencapsdata/xen-ia64-be-hvm.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<capabilities>
-
-  <host>
-    <cpu>
-      <arch>ia64</arch>
-    </cpu>
-    <power_management/>
-    <migration_features>
-      <live/>
-      <uri_transports>
-        <uri_transport>xenmigr</uri_transport>
-      </uri_transports>
-    </migration_features>
-  </host>
-
-  <guest>
-    <os_type>xen</os_type>
-    <arch name='ia64'>
-      <wordsize>64</wordsize>
-      <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
-      <machine>xenpv</machine>
-      <domain type='xen'/>
-    </arch>
-    <features>
-      <ia64_be/>
-    </features>
-  </guest>
-
-  <guest>
-    <os_type>hvm</os_type>
-    <arch name='ia64'>
-      <wordsize>64</wordsize>
-      <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
-      <loader>/usr/lib/xen/boot/hvmloader</loader>
-      <machine>xenfv</machine>
-      <domain type='xen'/>
-    </arch>
-    <features>
-      <ia64_be/>
-      <acpi default='on' toggle='yes'/>
-      <apic default='on' toggle='yes'/>
-    </features>
-  </guest>
-
-</capabilities>

diff --git a/tests/xencapsdata/xen-ia64-be.caps b/tests/xencapsdata/xen-ia64-be.caps
deleted file mode 100644 (file)
index d39c45e..0000000
--- a/tests/xencapsdata/xen-ia64-be.caps
+++ /dev/null
@@ -1 +0,0 @@
-xen-3.0-ia64be

diff --git a/tests/xencapsdata/xen-ia64-be.cpuinfo b/tests/xencapsdata/xen-ia64-be.cpuinfo
deleted file mode 100644 (file)
index 0b70bfd..0000000
--- a/tests/xencapsdata/xen-ia64-be.cpuinfo
+++ /dev/null
@@ -1,29 +0,0 @@
-processor  : 0
-vendor     : Xen/ia64
-arch       : IA-64
-family     : 32
-model      : 0
-revision   : 7
-archrev    : 0
-features   : branchlong, 16-byte atomic ops
-cpu number : 0
-cpu regs   : 4
-cpu MHz    : 1594.000670
-itc MHz    : 399.165930
-BogoMIPS   : 3186.68
-siblings   : 1
-
-processor  : 1
-vendor     : Xen/ia64
-arch       : IA-64
-family     : 32
-model      : 0
-revision   : 7
-archrev    : 0
-features   : branchlong, 16-byte atomic ops
-cpu number : 0
-cpu regs   : 4
-cpu MHz    : 1594.000670
-itc MHz    : 399.165930
-BogoMIPS   : 3186.68
-siblings   : 1

diff --git a/tests/xencapsdata/xen-ia64-be.xml b/tests/xencapsdata/xen-ia64-be.xml
deleted file mode 100644 (file)
index 78fa77e..0000000
--- a/tests/xencapsdata/xen-ia64-be.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<capabilities>
-
-  <host>
-    <cpu>
-      <arch>ia64</arch>
-    </cpu>
-    <power_management/>
-    <migration_features>
-      <live/>
-      <uri_transports>
-        <uri_transport>xenmigr</uri_transport>
-      </uri_transports>
-    </migration_features>
-  </host>
-
-  <guest>
-    <os_type>xen</os_type>
-    <arch name='ia64'>
-      <wordsize>64</wordsize>
-      <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
-      <machine>xenpv</machine>
-      <domain type='xen'/>
-    </arch>
-    <features>
-      <ia64_be/>
-    </features>
-  </guest>
-
-</capabilities>

diff --git a/tests/xencapsdata/xen-ia64-hvm.caps b/tests/xencapsdata/xen-ia64-hvm.caps
deleted file mode 100644 (file)
index 21c7a21..0000000
--- a/tests/xencapsdata/xen-ia64-hvm.caps
+++ /dev/null
@@ -1 +0,0 @@
-xen-3.0-ia64 hvm-3.0-ia64

diff --git a/tests/xencapsdata/xen-ia64-hvm.cpuinfo b/tests/xencapsdata/xen-ia64-hvm.cpuinfo
deleted file mode 100644 (file)
index 0b70bfd..0000000
--- a/tests/xencapsdata/xen-ia64-hvm.cpuinfo
+++ /dev/null
@@ -1,29 +0,0 @@
-processor  : 0
-vendor     : Xen/ia64
-arch       : IA-64
-family     : 32
-model      : 0
-revision   : 7
-archrev    : 0
-features   : branchlong, 16-byte atomic ops
-cpu number : 0
-cpu regs   : 4
-cpu MHz    : 1594.000670
-itc MHz    : 399.165930
-BogoMIPS   : 3186.68
-siblings   : 1
-
-processor  : 1
-vendor     : Xen/ia64
-arch       : IA-64
-family     : 32
-model      : 0
-revision   : 7
-archrev    : 0
-features   : branchlong, 16-byte atomic ops
-cpu number : 0
-cpu regs   : 4
-cpu MHz    : 1594.000670
-itc MHz    : 399.165930
-BogoMIPS   : 3186.68
-siblings   : 1

diff --git a/tests/xencapsdata/xen-ia64-hvm.xml b/tests/xencapsdata/xen-ia64-hvm.xml
deleted file mode 100644 (file)
index 6e22372..0000000
--- a/tests/xencapsdata/xen-ia64-hvm.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<capabilities>
-
-  <host>
-    <cpu>
-      <arch>ia64</arch>
-    </cpu>
-    <power_management/>
-    <migration_features>
-      <live/>
-      <uri_transports>
-        <uri_transport>xenmigr</uri_transport>
-      </uri_transports>
-    </migration_features>
-  </host>
-
-  <guest>
-    <os_type>xen</os_type>
-    <arch name='ia64'>
-      <wordsize>64</wordsize>
-      <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
-      <machine>xenpv</machine>
-      <domain type='xen'/>
-    </arch>
-  </guest>
-
-  <guest>
-    <os_type>hvm</os_type>
-    <arch name='ia64'>
-      <wordsize>64</wordsize>
-      <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
-      <loader>/usr/lib/xen/boot/hvmloader</loader>
-      <machine>xenfv</machine>
-      <domain type='xen'/>
-    </arch>
-    <features>
-      <acpi default='on' toggle='yes'/>
-      <apic default='on' toggle='yes'/>
-    </features>
-  </guest>
-
-</capabilities>

diff --git a/tests/xencapsdata/xen-ia64.caps b/tests/xencapsdata/xen-ia64.caps
deleted file mode 100644 (file)
index b93c0b9..0000000
--- a/tests/xencapsdata/xen-ia64.caps
+++ /dev/null
@@ -1 +0,0 @@
-xen-3.0-ia64

diff --git a/tests/xencapsdata/xen-ia64.cpuinfo b/tests/xencapsdata/xen-ia64.cpuinfo
deleted file mode 100644 (file)
index 0b70bfd..0000000
--- a/tests/xencapsdata/xen-ia64.cpuinfo
+++ /dev/null
@@ -1,29 +0,0 @@
-processor  : 0
-vendor     : Xen/ia64
-arch       : IA-64
-family     : 32
-model      : 0
-revision   : 7
-archrev    : 0
-features   : branchlong, 16-byte atomic ops
-cpu number : 0
-cpu regs   : 4
-cpu MHz    : 1594.000670
-itc MHz    : 399.165930
-BogoMIPS   : 3186.68
-siblings   : 1
-
-processor  : 1
-vendor     : Xen/ia64
-arch       : IA-64
-family     : 32
-model      : 0
-revision   : 7
-archrev    : 0
-features   : branchlong, 16-byte atomic ops
-cpu number : 0
-cpu regs   : 4
-cpu MHz    : 1594.000670
-itc MHz    : 399.165930
-BogoMIPS   : 3186.68
-siblings   : 1

diff --git a/tests/xencapsdata/xen-ia64.xml b/tests/xencapsdata/xen-ia64.xml
deleted file mode 100644 (file)
index 9e3eaf4..0000000
--- a/tests/xencapsdata/xen-ia64.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<capabilities>
-
-  <host>
-    <cpu>
-      <arch>ia64</arch>
-    </cpu>
-    <power_management/>
-    <migration_features>
-      <live/>
-      <uri_transports>
-        <uri_transport>xenmigr</uri_transport>
-      </uri_transports>
-    </migration_features>
-  </host>
-
-  <guest>
-    <os_type>xen</os_type>
-    <arch name='ia64'>
-      <wordsize>64</wordsize>
-      <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
-      <machine>xenpv</machine>
-      <domain type='xen'/>
-    </arch>
-  </guest>
-
-</capabilities>

diff --git a/tests/xencapsdata/xen-ppc64.caps b/tests/xencapsdata/xen-ppc64.caps
deleted file mode 100644 (file)
index df0fe93..0000000
--- a/tests/xencapsdata/xen-ppc64.caps
+++ /dev/null
@@ -1 +0,0 @@
-xen-3.0-powerpc64

diff --git a/tests/xencapsdata/xen-ppc64.cpuinfo b/tests/xencapsdata/xen-ppc64.cpuinfo
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/tests/xencapsdata/xen-ppc64.xml b/tests/xencapsdata/xen-ppc64.xml
deleted file mode 100644 (file)
index 0132c45..0000000
--- a/tests/xencapsdata/xen-ppc64.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<capabilities>
-
-  <host>
-    <cpu>
-      <arch>ppc64</arch>
-    </cpu>
-    <power_management/>
-    <migration_features>
-      <live/>
-      <uri_transports>
-        <uri_transport>xenmigr</uri_transport>
-      </uri_transports>
-    </migration_features>
-  </host>
-
-  <guest>
-    <os_type>xen</os_type>
-    <arch name='ppc64'>
-      <wordsize>64</wordsize>
-      <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
-      <machine>xenpv</machine>
-      <domain type='xen'/>
-    </arch>
-  </guest>
-
-</capabilities>

diff --git a/tests/xencapsdata/xen-x86_64-hvm.caps b/tests/xencapsdata/xen-x86_64-hvm.caps
deleted file mode 100644 (file)
index 1701a34..0000000
--- a/tests/xencapsdata/xen-x86_64-hvm.caps
+++ /dev/null
@@ -1 +0,0 @@
-xen-3.0-x86_64 hvm-3.0-x86_32 hvm-3.0-x86_32p hvm-3.0-x86_64

diff --git a/tests/xencapsdata/xen-x86_64-hvm.cpuinfo b/tests/xencapsdata/xen-x86_64-hvm.cpuinfo
deleted file mode 100644 (file)
index 1beedd2..0000000
--- a/tests/xencapsdata/xen-x86_64-hvm.cpuinfo
+++ /dev/null
@@ -1,47 +0,0 @@
-processor       : 0
-vendor_id       : AuthenticAMD
-cpu family      : 15
-model           : 67
-model name      : AMD Athlon(tm) 64 X2 Dual Core Processor 5200+
-stepping        : 2
-cpu MHz         : 2600.000
-cache size      : 1024 KB
-physical id     : 0
-siblings        : 1
-core id         : 0
-cpu cores       : 1
-fpu             : yes
-fpu_exception   : yes
-cpuid level     : 1
-wp              : yes
-flags           : fpu tsc msr pae mce cx8 apic mtrr mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt rdtscp lm 3dnowext 3dnow pni cx16 lahf_lm cmp_legacy svm cr8_legacy
-bogomips        : 6469.52
-TLB size        : 1024 4K pages
-clflush size    : 64
-cache_alignment : 64
-address sizes   : 40 bits physical, 48 bits virtual
-power management: ts fid vid ttp tm stc
-
-processor       : 1
-vendor_id       : AuthenticAMD
-cpu family      : 15
-model           : 67
-model name      : AMD Athlon(tm) 64 X2 Dual Core Processor 5200+
-stepping        : 2
-cpu MHz         : 2600.000
-cache size      : 1024 KB
-physical id     : 1
-siblings        : 1
-core id         : 0
-cpu cores       : 1
-fpu             : yes
-fpu_exception   : yes
-cpuid level     : 1
-wp              : yes
-flags           : fpu tsc msr pae mce cx8 apic mtrr mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt rdtscp lm 3dnowext 3dnow pni cx16 lahf_lm cmp_legacy svm cr8_legacy
-bogomips        : 6469.52
-TLB size        : 1024 4K pages
-clflush size    : 64
-cache_alignment : 64
-address sizes   : 40 bits physical, 48 bits virtual
-power management: ts fid vid ttp tm stc

diff --git a/tests/xencapsdata/xen-x86_64-hvm.xml b/tests/xencapsdata/xen-x86_64-hvm.xml
deleted file mode 100644 (file)
index 7458f0b..0000000
--- a/tests/xencapsdata/xen-x86_64-hvm.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<capabilities>
-
-  <host>
-    <cpu>
-      <arch>x86_64</arch>
-      <features>
-        <svm/>
-      </features>
-    </cpu>
-    <power_management/>
-    <migration_features>
-      <live/>
-      <uri_transports>
-        <uri_transport>xenmigr</uri_transport>
-      </uri_transports>
-    </migration_features>
-  </host>
-
-  <guest>
-    <os_type>xen</os_type>
-    <arch name='x86_64'>
-      <wordsize>64</wordsize>
-      <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
-      <machine>xenpv</machine>
-      <domain type='xen'/>
-    </arch>
-  </guest>
-
-  <guest>
-    <os_type>hvm</os_type>
-    <arch name='i686'>
-      <wordsize>32</wordsize>
-      <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
-      <loader>/usr/lib/xen/boot/hvmloader</loader>
-      <machine>xenfv</machine>
-      <domain type='xen'/>
-    </arch>
-    <features>
-      <pae/>
-      <nonpae/>
-      <acpi default='on' toggle='yes'/>
-      <apic default='on' toggle='yes'/>
-    </features>
-  </guest>
-
-  <guest>
-    <os_type>hvm</os_type>
-    <arch name='x86_64'>
-      <wordsize>64</wordsize>
-      <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
-      <loader>/usr/lib/xen/boot/hvmloader</loader>
-      <machine>xenfv</machine>
-      <domain type='xen'/>
-    </arch>
-    <features>
-      <acpi default='on' toggle='yes'/>
-      <apic default='on' toggle='yes'/>
-    </features>
-  </guest>
-
-</capabilities>

diff --git a/tests/xencapsdata/xen-x86_64.caps b/tests/xencapsdata/xen-x86_64.caps
deleted file mode 100644 (file)
index d627a0e..0000000
--- a/tests/xencapsdata/xen-x86_64.caps
+++ /dev/null
@@ -1 +0,0 @@
-xen-3.0-x86_64

diff --git a/tests/xencapsdata/xen-x86_64.cpuinfo b/tests/xencapsdata/xen-x86_64.cpuinfo
deleted file mode 100644 (file)
index 1beedd2..0000000
--- a/tests/xencapsdata/xen-x86_64.cpuinfo
+++ /dev/null
@@ -1,47 +0,0 @@
-processor       : 0
-vendor_id       : AuthenticAMD
-cpu family      : 15
-model           : 67
-model name      : AMD Athlon(tm) 64 X2 Dual Core Processor 5200+
-stepping        : 2
-cpu MHz         : 2600.000
-cache size      : 1024 KB
-physical id     : 0
-siblings        : 1
-core id         : 0
-cpu cores       : 1
-fpu             : yes
-fpu_exception   : yes
-cpuid level     : 1
-wp              : yes
-flags           : fpu tsc msr pae mce cx8 apic mtrr mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt rdtscp lm 3dnowext 3dnow pni cx16 lahf_lm cmp_legacy svm cr8_legacy
-bogomips        : 6469.52
-TLB size        : 1024 4K pages
-clflush size    : 64
-cache_alignment : 64
-address sizes   : 40 bits physical, 48 bits virtual
-power management: ts fid vid ttp tm stc
-
-processor       : 1
-vendor_id       : AuthenticAMD
-cpu family      : 15
-model           : 67
-model name      : AMD Athlon(tm) 64 X2 Dual Core Processor 5200+
-stepping        : 2
-cpu MHz         : 2600.000
-cache size      : 1024 KB
-physical id     : 1
-siblings        : 1
-core id         : 0
-cpu cores       : 1
-fpu             : yes
-fpu_exception   : yes
-cpuid level     : 1
-wp              : yes
-flags           : fpu tsc msr pae mce cx8 apic mtrr mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt rdtscp lm 3dnowext 3dnow pni cx16 lahf_lm cmp_legacy svm cr8_legacy
-bogomips        : 6469.52
-TLB size        : 1024 4K pages
-clflush size    : 64
-cache_alignment : 64
-address sizes   : 40 bits physical, 48 bits virtual
-power management: ts fid vid ttp tm stc

diff --git a/tests/xencapsdata/xen-x86_64.xml b/tests/xencapsdata/xen-x86_64.xml
deleted file mode 100644 (file)
index b686432..0000000
--- a/tests/xencapsdata/xen-x86_64.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<capabilities>
-
-  <host>
-    <cpu>
-      <arch>x86_64</arch>
-      <features>
-        <svm/>
-      </features>
-    </cpu>
-    <power_management/>
-    <migration_features>
-      <live/>
-      <uri_transports>
-        <uri_transport>xenmigr</uri_transport>
-      </uri_transports>
-    </migration_features>
-  </host>
-
-  <guest>
-    <os_type>xen</os_type>
-    <arch name='x86_64'>
-      <wordsize>64</wordsize>
-      <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
-      <machine>xenpv</machine>
-      <domain type='xen'/>
-    </arch>
-  </guest>
-
-</capabilities>

diff --git a/tests/xencapstest.c b/tests/xencapstest.c
deleted file mode 100644 (file)
index 7cbd43f..0000000
--- a/tests/xencapstest.c
+++ /dev/null
@@ -1,224 +0,0 @@
-#include <config.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "internal.h"
-#include "virxml.h"
-#include "testutils.h"
-#include "xen/xen_hypervisor.h"
-#include "virfile.h"
-#include "virstring.h"
-
-#define VIR_FROM_THIS VIR_FROM_NONE
-
-static int
-testCompareFiles(virArch hostmachine, const char *xml_rel,
-                 const char *cpuinfo_rel, const char *capabilities_rel)
-{
-  char *actualxml = NULL;
-  FILE *fp1 = NULL, *fp2 = NULL;
-  virCapsPtr caps = NULL;
-
-  int ret = -1;
-
-  char *xml = NULL;
-  char *cpuinfo = NULL;
-  char *capabilities = NULL;
-
-  if (virAsprintf(&xml, "%s/%s", abs_srcdir, xml_rel) < 0 ||
-      virAsprintf(&cpuinfo, "%s/%s", abs_srcdir, cpuinfo_rel) < 0 ||
-      virAsprintf(&capabilities, "%s/%s", abs_srcdir, capabilities_rel) < 0)
-      goto fail;
-
-  if (!(fp1 = fopen(cpuinfo, "r")))
-      goto fail;
-
-  if (!(fp2 = fopen(capabilities, "r")))
-      goto fail;
-
-  if (!(caps = xenHypervisorMakeCapabilitiesInternal(NULL, hostmachine, fp1, fp2)))
-      goto fail;
-
-  if (!(actualxml = virCapabilitiesFormatXML(caps)))
-      goto fail;
-
-  if (virTestCompareToFile(actualxml, xml) < 0)
-      goto fail;
-
-  ret = 0;
-
- fail:
-  VIR_FREE(actualxml);
-  VIR_FREE(xml);
-  VIR_FREE(cpuinfo);
-  VIR_FREE(capabilities);
-  VIR_FORCE_FCLOSE(fp1);
-  VIR_FORCE_FCLOSE(fp2);
-
-  virObjectUnref(caps);
-  return ret;
-}
-
-static int testXeni686(const void *data ATTRIBUTE_UNUSED)
-{
-    return testCompareFiles(VIR_ARCH_I686,
-                            "xencapsdata/xen-i686.xml",
-                            "xencapsdata/xen-i686.cpuinfo",
-                            "xencapsdata/xen-i686.caps");
-}
-
-static int testXeni686PAE(const void *data ATTRIBUTE_UNUSED)
-{
-    return testCompareFiles(VIR_ARCH_I686,
-                            "xencapsdata/xen-i686-pae.xml",
-                            "xencapsdata/xen-i686-pae.cpuinfo",
-                            "xencapsdata/xen-i686-pae.caps");
-}
-
-static int testXeni686PAEHVM(const void *data ATTRIBUTE_UNUSED)
-{
-    return testCompareFiles(VIR_ARCH_I686,
-                            "xencapsdata/xen-i686-pae-hvm.xml",
-                            "xencapsdata/xen-i686-pae-hvm.cpuinfo",
-                            "xencapsdata/xen-i686-pae-hvm.caps");
-}
-
-/* No PAE + HVM is non-sensical - all VMX capable
-   CPUs have PAE */
-/*
-static int testXeni686HVM(const void *data ATTRIBUTE_UNUSED)
-{
-  return testCompareFiles(VIR_ARCH_I686,
-                          "xencapsdata/xen-i686-hvm.xml",
-                          "xencapsdata/xen-i686.cpuinfo",
-                          "xencapsdata/xen-i686-hvm.caps");
-}
-*/
-
-static int testXenx86_64(const void *data ATTRIBUTE_UNUSED)
-{
-    return testCompareFiles(VIR_ARCH_X86_64,
-                            "xencapsdata/xen-x86_64.xml",
-                            "xencapsdata/xen-x86_64.cpuinfo",
-                            "xencapsdata/xen-x86_64.caps");
-}
-static int testXenx86_64HVM(const void *data ATTRIBUTE_UNUSED)
-{
-    return testCompareFiles(VIR_ARCH_X86_64,
-                            "xencapsdata/xen-x86_64-hvm.xml",
-                            "xencapsdata/xen-x86_64-hvm.cpuinfo",
-                            "xencapsdata/xen-x86_64-hvm.caps");
-}
-
-static int testXenia64(const void *data ATTRIBUTE_UNUSED)
-{
-    return testCompareFiles(VIR_ARCH_ITANIUM,
-                            "xencapsdata/xen-ia64.xml",
-                            "xencapsdata/xen-ia64.cpuinfo",
-                            "xencapsdata/xen-ia64.caps");
-}
-static int testXenia64BE(const void *data ATTRIBUTE_UNUSED)
-{
-    return testCompareFiles(VIR_ARCH_ITANIUM,
-                            "xencapsdata/xen-ia64-be.xml",
-                            "xencapsdata/xen-ia64-be.cpuinfo",
-                            "xencapsdata/xen-ia64-be.caps");
-}
-
-static int testXenia64HVM(const void *data ATTRIBUTE_UNUSED)
-{
-    return testCompareFiles(VIR_ARCH_ITANIUM,
-                            "xencapsdata/xen-ia64-hvm.xml",
-                            "xencapsdata/xen-ia64-hvm.cpuinfo",
-                            "xencapsdata/xen-ia64-hvm.caps");
-}
-static int testXenia64BEHVM(const void *data ATTRIBUTE_UNUSED)
-{
-    return testCompareFiles(VIR_ARCH_ITANIUM,
-                            "xencapsdata/xen-ia64-be-hvm.xml",
-                            "xencapsdata/xen-ia64-be-hvm.cpuinfo",
-                            "xencapsdata/xen-ia64-be-hvm.caps");
-}
-
-static int testXenppc64(const void *data ATTRIBUTE_UNUSED)
-{
-    return testCompareFiles(VIR_ARCH_PPC64,
-                            "xencapsdata/xen-ppc64.xml",
-                            "xencapsdata/xen-ppc64.cpuinfo",
-                            "xencapsdata/xen-ppc64.caps");
-}
-
-
-/* Fake initialization data for xenHypervisorInit(). Must be initialized
- * explicitly before the implicit call via virInitialize(). */
-static struct xenHypervisorVersions hv_versions = {
-    .hv = 0,
-    .hypervisor = 2,
-    .sys_interface = -1,
-    .dom_interface = -1,
-};
-
-static int
-mymain(void)
-{
-    int ret = 0;
-
-    xenHypervisorInit(&hv_versions);
-    if (virInitialize() < 0)
-        return EXIT_FAILURE;
-
-    if (virTestRun("Capabilities for i686, no PAE, no HVM",
-                   testXeni686, NULL) != 0)
-        ret = -1;
-
-    if (virTestRun("Capabilities for i686, PAE, no HVM",
-                   testXeni686PAE, NULL) != 0)
-        ret = -1;
-
-    /* No PAE + HVM is non-sensical - all VMX capable
-       CPUs have PAE */
-    /*if (virTestRun("Capabilities for i686, no PAE, HVM",
-                    testXeni686HVM, NULL) != 0)
-        ret = -1;
-    */
-
-    if (virTestRun("Capabilities for i686, PAE, HVM",
-                   testXeni686PAEHVM, NULL) != 0)
-        ret = -1;
-
-    if (virTestRun("Capabilities for x86_64, no HVM",
-                   testXenx86_64, NULL) != 0)
-        ret = -1;
-
-    if (virTestRun("Capabilities for x86_64, HVM",
-                   testXenx86_64HVM, NULL) != 0)
-        ret = -1;
-
-    if (virTestRun("Capabilities for ia64, no HVM, LE",
-                   testXenia64, NULL) != 0)
-        ret = -1;
-
-    if (virTestRun("Capabilities for ia64, HVM, LE",
-                   testXenia64HVM, NULL) != 0)
-        ret = -1;
-
-    if (virTestRun("Capabilities for ia64, no HVM, BE",
-                   testXenia64BE, NULL) != 0)
-        ret = -1;
-
-    if (virTestRun("Capabilities for ia64, HVM, BE",
-                   testXenia64BEHVM, NULL) != 0)
-        ret = -1;
-
-    if (virTestRun("Capabilities for ppc64",
-                   testXenppc64, NULL) != 0)
-        ret = -1;
-
-
-    return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
-}
-
-VIR_TEST_MAIN(mymain)