2008-01-29 18:15:54 +00:00
|
|
|
#include <config.h>
|
2007-11-26 12:03:34 +00:00
|
|
|
|
2007-03-27 14:45:17 +00:00
|
|
|
#include <stdio.h>
|
2007-05-29 14:44:15 +00:00
|
|
|
#include <stdlib.h>
|
Wed Dec 5 13:48:00 UTC 2007 Richard W.M. Jones <rjones@redhat.com>
* python/libvir.c, python/libvirt_wrap.h, qemud/qemud.c,
qemud/remote.c, src/internal.h, src/openvz_conf.c,
src/openvz_driver.c, src/proxy_internal.h, src/qemu_conf.c,
src/qemu_driver.c, src/remote_internal.h, src/test.h, src/util.c,
src/xen_unified.c, src/xen_unified.h, tests/nodeinfotest.c,
tests/qemuxml2argvtest.c, tests/qemuxml2xmltest.c, tests/reconnect.c,
tests/sexpr2xmltest.c, tests/virshtest.c, tests/xencapstest.c,
tests/xmconfigtest.c, tests/xml2sexprtest.c:
Change #include <> to #include "" for local includes.
Removed many includes from src/internal.h and put them in
the C files which actually use them.
Removed <ansidecl.h> - unused.
Added a comment around __func__.
Removed a clashing redefinition of VERSION symbol.
All limits (PATH_MAX etc) now done in src/internal.h, so we
don't need to include those headers in other files.
2007-12-05 13:56:22 +00:00
|
|
|
#include <string.h>
|
2008-05-29 15:31:49 +00:00
|
|
|
#include <unistd.h>
|
2007-05-29 14:44:15 +00:00
|
|
|
|
Wed Dec 5 13:48:00 UTC 2007 Richard W.M. Jones <rjones@redhat.com>
* python/libvir.c, python/libvirt_wrap.h, qemud/qemud.c,
qemud/remote.c, src/internal.h, src/openvz_conf.c,
src/openvz_driver.c, src/proxy_internal.h, src/qemu_conf.c,
src/qemu_driver.c, src/remote_internal.h, src/test.h, src/util.c,
src/xen_unified.c, src/xen_unified.h, tests/nodeinfotest.c,
tests/qemuxml2argvtest.c, tests/qemuxml2xmltest.c, tests/reconnect.c,
tests/sexpr2xmltest.c, tests/virshtest.c, tests/xencapstest.c,
tests/xmconfigtest.c, tests/xml2sexprtest.c:
Change #include <> to #include "" for local includes.
Removed many includes from src/internal.h and put them in
the C files which actually use them.
Removed <ansidecl.h> - unused.
Added a comment around __func__.
Removed a clashing redefinition of VERSION symbol.
All limits (PATH_MAX etc) now done in src/internal.h, so we
don't need to include those headers in other files.
2007-12-05 13:56:22 +00:00
|
|
|
#include "internal.h"
|
2007-03-27 14:45:17 +00:00
|
|
|
#include "xml.h"
|
|
|
|
#include "testutils.h"
|
Move xen driver code into src/xen/ directory
* src/Makefile.am, src/proxy_internal.c, src/proxy_internal.h
src/sexpr.c, src/sexpr.h, src/xen_unified.c, src/xen_unified.h,
src/xen_internal.c, src/xen_internal.h, src/xen_inotify.c,
src/xen_inotify.h, src/xend_internal.c, src/xend_internal.h,
src/xm_internal.c, src/xm_internal.h, src/xs_internal.c,
src/xs_internal.h: Move to src/xen/ directory
* proxy/Makefile.am, proxy/libvirt_proxy.c, src/Makefile.am,
src/libvirt.c, tests/sexpr2xmltest.c, tests/statstest.c,
tests/xencapstest.c, tests/xmconfigtest.c, tests/xml2sexprtest.c:
Adapt to changed xen location
* src/stats_linux.h, src/stats_linux.c: Remove xen specific block
stats APIs
* src/qemu_driver.c, src/uml_driver.c: Add missing sys/un.h include
uncovered after change to stats_linux.h
* src/xen/block_stats.h, src/xen/block_stats.c: Add xen specific
block stats APIs
2009-09-15 15:38:33 +00:00
|
|
|
#include "xen/xen_hypervisor.h"
|
2007-03-27 14:45:17 +00:00
|
|
|
|
|
|
|
static char *progname;
|
2008-05-29 15:31:49 +00:00
|
|
|
static char *abs_srcdir;
|
2007-03-27 14:45:17 +00:00
|
|
|
|
|
|
|
#define MAX_FILE 4096
|
|
|
|
|
|
|
|
static int testCompareFiles(const char *hostmachine,
|
2007-11-14 10:35:58 +00:00
|
|
|
const char *xml_rel,
|
|
|
|
const char *cpuinfo_rel,
|
|
|
|
const char *capabilities_rel) {
|
2007-03-27 14:45:17 +00:00
|
|
|
char xmlData[MAX_FILE];
|
|
|
|
char *expectxml = &(xmlData[0]);
|
|
|
|
char *actualxml = NULL;
|
|
|
|
FILE *fp1 = NULL, *fp2 = NULL;
|
2008-07-25 13:17:27 +00:00
|
|
|
virCapsPtr caps = NULL;
|
2007-03-27 14:45:17 +00:00
|
|
|
|
|
|
|
int ret = -1;
|
|
|
|
|
2007-11-14 10:35:58 +00:00
|
|
|
char xml[PATH_MAX];
|
|
|
|
char cpuinfo[PATH_MAX];
|
|
|
|
char capabilities[PATH_MAX];
|
|
|
|
|
2008-05-29 15:31:49 +00:00
|
|
|
snprintf(xml, sizeof xml - 1, "%s/%s",
|
|
|
|
abs_srcdir, xml_rel);
|
|
|
|
snprintf(cpuinfo, sizeof cpuinfo - 1, "%s/%s",
|
|
|
|
abs_srcdir, cpuinfo_rel);
|
|
|
|
snprintf(capabilities, sizeof capabilities - 1, "%s/%s",
|
|
|
|
abs_srcdir, capabilities_rel);
|
2007-11-14 10:35:58 +00:00
|
|
|
|
2007-03-27 14:45:17 +00:00
|
|
|
if (virtTestLoadFile(xml, &expectxml, MAX_FILE) < 0)
|
2008-07-25 13:17:27 +00:00
|
|
|
goto fail;
|
2007-03-27 14:45:17 +00:00
|
|
|
|
|
|
|
if (!(fp1 = fopen(cpuinfo, "r")))
|
2008-07-25 13:17:27 +00:00
|
|
|
goto fail;
|
2007-03-27 14:45:17 +00:00
|
|
|
|
|
|
|
if (!(fp2 = fopen(capabilities, "r")))
|
2008-07-25 13:17:27 +00:00
|
|
|
goto fail;
|
2007-03-27 14:45:17 +00:00
|
|
|
|
2008-09-05 11:35:43 +00:00
|
|
|
if (!(caps = xenHypervisorMakeCapabilitiesInternal(NULL, hostmachine, fp1, fp2)))
|
2008-07-25 13:17:27 +00:00
|
|
|
goto fail;
|
|
|
|
|
|
|
|
if (!(actualxml = virCapabilitiesFormatXML(caps)))
|
|
|
|
goto fail;
|
2007-03-27 14:45:17 +00:00
|
|
|
|
2008-04-18 15:28:33 +00:00
|
|
|
if (STRNEQ(expectxml, actualxml)) {
|
|
|
|
virtTestDifference(stderr, expectxml, actualxml);
|
|
|
|
goto fail;
|
2007-03-27 14:45:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
ret = 0;
|
|
|
|
|
|
|
|
fail:
|
|
|
|
|
2008-01-29 17:41:07 +00:00
|
|
|
free(actualxml);
|
2007-03-27 14:45:17 +00:00
|
|
|
if (fp1)
|
|
|
|
fclose(fp1);
|
|
|
|
if (fp2)
|
|
|
|
fclose(fp2);
|
|
|
|
|
2008-07-25 13:17:27 +00:00
|
|
|
virCapabilitiesFree(caps);
|
2007-03-27 14:45:17 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2007-07-18 21:08:22 +00:00
|
|
|
static int testXeni686(const void *data ATTRIBUTE_UNUSED) {
|
2007-03-27 14:45:17 +00:00
|
|
|
return testCompareFiles("i686",
|
2008-04-10 16:54:54 +00:00
|
|
|
"xencapsdata/xen-i686.xml",
|
|
|
|
"xencapsdata/xen-i686.cpuinfo",
|
|
|
|
"xencapsdata/xen-i686.caps");
|
2007-03-27 14:45:17 +00:00
|
|
|
}
|
|
|
|
|
2007-07-18 21:08:22 +00:00
|
|
|
static int testXeni686PAE(const void *data ATTRIBUTE_UNUSED) {
|
2007-03-27 14:45:17 +00:00
|
|
|
return testCompareFiles("i686",
|
2008-04-10 16:54:54 +00:00
|
|
|
"xencapsdata/xen-i686-pae.xml",
|
|
|
|
"xencapsdata/xen-i686-pae.cpuinfo",
|
|
|
|
"xencapsdata/xen-i686-pae.caps");
|
2007-03-27 14:45:17 +00:00
|
|
|
}
|
|
|
|
|
2007-07-18 21:08:22 +00:00
|
|
|
static int testXeni686PAEHVM(const void *data ATTRIBUTE_UNUSED) {
|
2007-03-27 14:45:17 +00:00
|
|
|
return testCompareFiles("i686",
|
2008-04-10 16:54:54 +00:00
|
|
|
"xencapsdata/xen-i686-pae-hvm.xml",
|
|
|
|
"xencapsdata/xen-i686-pae-hvm.cpuinfo",
|
|
|
|
"xencapsdata/xen-i686-pae-hvm.caps");
|
2007-03-27 14:45:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* No PAE + HVM is non-sensical - all VMX capable
|
|
|
|
CPUs have PAE */
|
|
|
|
/*
|
2007-07-18 21:08:22 +00:00
|
|
|
static int testXeni686HVM(const void *data ATTRIBUTE_UNUSED) {
|
2007-03-27 14:45:17 +00:00
|
|
|
return testCompareFiles("i686",
|
2008-04-10 16:54:54 +00:00
|
|
|
"xencapsdata/xen-i686-hvm.xml",
|
|
|
|
"xencapsdata/xen-i686.cpuinfo",
|
|
|
|
"xencapsdata/xen-i686-hvm.caps");
|
2007-03-27 14:45:17 +00:00
|
|
|
}
|
|
|
|
*/
|
|
|
|
|
2007-07-18 21:08:22 +00:00
|
|
|
static int testXenx86_64(const void *data ATTRIBUTE_UNUSED) {
|
2007-03-27 14:45:17 +00:00
|
|
|
return testCompareFiles("x86_64",
|
2008-04-10 16:54:54 +00:00
|
|
|
"xencapsdata/xen-x86_64.xml",
|
|
|
|
"xencapsdata/xen-x86_64.cpuinfo",
|
|
|
|
"xencapsdata/xen-x86_64.caps");
|
2007-03-27 14:45:17 +00:00
|
|
|
}
|
2007-07-18 21:08:22 +00:00
|
|
|
static int testXenx86_64HVM(const void *data ATTRIBUTE_UNUSED) {
|
2007-03-27 14:45:17 +00:00
|
|
|
return testCompareFiles("x86_64",
|
2008-04-10 16:54:54 +00:00
|
|
|
"xencapsdata/xen-x86_64-hvm.xml",
|
|
|
|
"xencapsdata/xen-x86_64-hvm.cpuinfo",
|
|
|
|
"xencapsdata/xen-x86_64-hvm.caps");
|
2007-03-27 14:45:17 +00:00
|
|
|
}
|
|
|
|
|
2007-07-18 21:08:22 +00:00
|
|
|
static int testXenia64(const void *data ATTRIBUTE_UNUSED) {
|
2007-03-27 14:45:17 +00:00
|
|
|
return testCompareFiles("ia64",
|
2008-04-10 16:54:54 +00:00
|
|
|
"xencapsdata/xen-ia64.xml",
|
|
|
|
"xencapsdata/xen-ia64.cpuinfo",
|
|
|
|
"xencapsdata/xen-ia64.caps");
|
2007-03-27 14:45:17 +00:00
|
|
|
}
|
2007-07-18 21:08:22 +00:00
|
|
|
static int testXenia64BE(const void *data ATTRIBUTE_UNUSED) {
|
2007-03-27 14:45:17 +00:00
|
|
|
return testCompareFiles("ia64",
|
2008-04-10 16:54:54 +00:00
|
|
|
"xencapsdata/xen-ia64-be.xml",
|
|
|
|
"xencapsdata/xen-ia64-be.cpuinfo",
|
|
|
|
"xencapsdata/xen-ia64-be.caps");
|
2007-03-27 14:45:17 +00:00
|
|
|
}
|
|
|
|
|
2007-07-18 21:08:22 +00:00
|
|
|
static int testXenia64HVM(const void *data ATTRIBUTE_UNUSED) {
|
2007-03-27 14:45:17 +00:00
|
|
|
return testCompareFiles("ia64",
|
2008-04-10 16:54:54 +00:00
|
|
|
"xencapsdata/xen-ia64-hvm.xml",
|
|
|
|
"xencapsdata/xen-ia64-hvm.cpuinfo",
|
|
|
|
"xencapsdata/xen-ia64-hvm.caps");
|
2007-03-27 14:45:17 +00:00
|
|
|
}
|
2007-07-18 21:08:22 +00:00
|
|
|
static int testXenia64BEHVM(const void *data ATTRIBUTE_UNUSED) {
|
2007-03-27 14:45:17 +00:00
|
|
|
return testCompareFiles("ia64",
|
2008-04-10 16:54:54 +00:00
|
|
|
"xencapsdata/xen-ia64-be-hvm.xml",
|
|
|
|
"xencapsdata/xen-ia64-be-hvm.cpuinfo",
|
|
|
|
"xencapsdata/xen-ia64-be-hvm.caps");
|
2007-03-27 14:45:17 +00:00
|
|
|
}
|
|
|
|
|
2007-07-18 21:08:22 +00:00
|
|
|
static int testXenppc64(const void *data ATTRIBUTE_UNUSED) {
|
2007-03-27 14:45:17 +00:00
|
|
|
return testCompareFiles("ppc64",
|
2008-04-10 16:54:54 +00:00
|
|
|
"xencapsdata/xen-ppc64.xml",
|
|
|
|
"xencapsdata/xen-ppc64.cpuinfo",
|
|
|
|
"xencapsdata/xen-ppc64.caps");
|
2007-03-27 14:45:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2008-05-29 15:31:49 +00:00
|
|
|
static int
|
|
|
|
mymain(int argc, char **argv)
|
2007-03-27 14:45:17 +00:00
|
|
|
{
|
|
|
|
int ret = 0;
|
2008-05-29 15:31:49 +00:00
|
|
|
char cwd[PATH_MAX];
|
2007-03-27 14:45:17 +00:00
|
|
|
|
|
|
|
progname = argv[0];
|
|
|
|
|
|
|
|
if (argc > 1) {
|
2008-04-10 16:54:54 +00:00
|
|
|
fprintf(stderr, "Usage: %s\n", progname);
|
2008-05-29 15:31:49 +00:00
|
|
|
return(EXIT_FAILURE);
|
2007-03-27 14:45:17 +00:00
|
|
|
}
|
|
|
|
|
2008-05-29 15:31:49 +00:00
|
|
|
abs_srcdir = getenv("abs_srcdir");
|
|
|
|
if (!abs_srcdir)
|
|
|
|
abs_srcdir = getcwd(cwd, sizeof(cwd));
|
2007-11-14 10:35:58 +00:00
|
|
|
|
2007-03-27 14:45:17 +00:00
|
|
|
virInitialize();
|
|
|
|
|
|
|
|
if (virtTestRun("Capabilities for i686, no PAE, no HVM",
|
2008-04-10 16:54:54 +00:00
|
|
|
1, testXeni686, NULL) != 0)
|
|
|
|
ret = -1;
|
2007-03-27 14:45:17 +00:00
|
|
|
|
|
|
|
if (virtTestRun("Capabilities for i686, PAE, no HVM",
|
2008-04-10 16:54:54 +00:00
|
|
|
1, testXeni686PAE, NULL) != 0)
|
|
|
|
ret = -1;
|
2007-03-27 14:45:17 +00:00
|
|
|
|
|
|
|
/* No PAE + HVM is non-sensical - all VMX capable
|
|
|
|
CPUs have PAE */
|
|
|
|
/*if (virtTestRun("Capabilities for i686, no PAE, HVM",
|
2008-04-10 16:54:54 +00:00
|
|
|
1, testXeni686HVM, NULL) != 0)
|
|
|
|
ret = -1;
|
2007-03-27 14:45:17 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
if (virtTestRun("Capabilities for i686, PAE, HVM",
|
2008-04-10 16:54:54 +00:00
|
|
|
1, testXeni686PAEHVM, NULL) != 0)
|
|
|
|
ret = -1;
|
2007-03-27 14:45:17 +00:00
|
|
|
|
|
|
|
if (virtTestRun("Capabilities for x86_64, no HVM",
|
2008-04-10 16:54:54 +00:00
|
|
|
1, testXenx86_64, NULL) != 0)
|
|
|
|
ret = -1;
|
2007-03-27 14:45:17 +00:00
|
|
|
|
|
|
|
if (virtTestRun("Capabilities for x86_64, HVM",
|
2008-04-10 16:54:54 +00:00
|
|
|
1, testXenx86_64HVM, NULL) != 0)
|
|
|
|
ret = -1;
|
2007-03-27 14:45:17 +00:00
|
|
|
|
|
|
|
if (virtTestRun("Capabilities for ia64, no HVM, LE",
|
2008-04-10 16:54:54 +00:00
|
|
|
1, testXenia64, NULL) != 0)
|
|
|
|
ret = -1;
|
2007-03-27 14:45:17 +00:00
|
|
|
|
|
|
|
if (virtTestRun("Capabilities for ia64, HVM, LE",
|
2008-04-10 16:54:54 +00:00
|
|
|
1, testXenia64HVM, NULL) != 0)
|
|
|
|
ret = -1;
|
2007-03-27 14:45:17 +00:00
|
|
|
|
|
|
|
if (virtTestRun("Capabilities for ia64, no HVM, BE",
|
2008-04-10 16:54:54 +00:00
|
|
|
1, testXenia64BE, NULL) != 0)
|
|
|
|
ret = -1;
|
2007-03-27 14:45:17 +00:00
|
|
|
|
|
|
|
if (virtTestRun("Capabilities for ia64, HVM, BE",
|
2008-04-10 16:54:54 +00:00
|
|
|
1, testXenia64BEHVM, NULL) != 0)
|
|
|
|
ret = -1;
|
2007-03-27 14:45:17 +00:00
|
|
|
|
|
|
|
if (virtTestRun("Capabilities for ppc64",
|
2008-04-10 16:54:54 +00:00
|
|
|
1, testXenppc64, NULL) != 0)
|
|
|
|
ret = -1;
|
2007-03-27 14:45:17 +00:00
|
|
|
|
|
|
|
|
2008-05-29 15:31:49 +00:00
|
|
|
return(ret==0 ? EXIT_SUCCESS : EXIT_FAILURE);
|
2007-03-27 14:45:17 +00:00
|
|
|
}
|
2007-05-29 14:44:15 +00:00
|
|
|
|
2008-05-29 15:31:49 +00:00
|
|
|
VIRT_TEST_MAIN(mymain)
|