mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-27 16:15:23 +00:00
0fab10e5ed
This patch series focuses on xendConfigVersion 2 (xm_internal) and 3 (xend_internal), but leaves out changes for xenapi drivers. See this link for more details about vcpu_avail for xm usage. http://lists.xensource.com/archives/html/xen-devel/2009-11/msg01061.html This relies on the fact that def->maxvcpus can be at most 32 with xen. * src/xen/xend_internal.c (xenDaemonParseSxpr) (sexpr_to_xend_domain_info, xenDaemonFormatSxpr): Use vcpu_avail when current vcpus is less than maximum. * src/xen/xm_internal.c (xenXMDomainConfigParse) (xenXMDomainConfigFormat): Likewise. * tests/xml2sexprdata/xml2sexpr-pv-vcpus.sexpr: New file. * tests/sexpr2xmldata/sexpr2xml-pv-vcpus.sexpr: Likewise. * tests/sexpr2xmldata/sexpr2xml-pv-vcpus.xml: Likewise. * tests/xmconfigdata/test-paravirt-vcpu.cfg: Likewise. * tests/xmconfigdata/test-paravirt-vcpu.xml: Likewise. * tests/xml2sexprtest.c (mymain): New test. * tests/sexpr2xmltest.c (mymain): Likewise. * tests/xmconfigtest.c (mymain): Likewise.
184 lines
5.2 KiB
C
184 lines
5.2 KiB
C
#include <config.h>
|
|
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
|
|
#include "internal.h"
|
|
#include "xml.h"
|
|
#include "datatypes.h"
|
|
#include "xen/xen_driver.h"
|
|
#include "xen/xend_internal.h"
|
|
#include "testutils.h"
|
|
#include "testutilsxen.h"
|
|
|
|
static char *progname;
|
|
static char *abs_srcdir;
|
|
static virCapsPtr caps;
|
|
|
|
#define MAX_FILE 4096
|
|
|
|
static int testCompareFiles(const char *xml, const char *sexpr,
|
|
int xendConfigVersion) {
|
|
char xmlData[MAX_FILE];
|
|
char sexprData[MAX_FILE];
|
|
char *gotxml = NULL;
|
|
char *xmlPtr = &(xmlData[0]);
|
|
char *sexprPtr = &(sexprData[0]);
|
|
int ret = -1;
|
|
virDomainDefPtr def = NULL;
|
|
virConnectPtr conn;
|
|
struct _xenUnifiedPrivate priv;
|
|
|
|
|
|
conn = virGetConnect();
|
|
if (!conn) goto fail;
|
|
|
|
if (virtTestLoadFile(xml, &xmlPtr, MAX_FILE) < 0)
|
|
goto fail;
|
|
|
|
if (virtTestLoadFile(sexpr, &sexprPtr, MAX_FILE) < 0)
|
|
goto fail;
|
|
|
|
memset(&priv, 0, sizeof priv);
|
|
/* Many puppies died to bring you this code. */
|
|
priv.xendConfigVersion = xendConfigVersion;
|
|
priv.caps = caps;
|
|
conn->privateData = &priv;
|
|
if (virMutexInit(&priv.lock) < 0)
|
|
goto fail;
|
|
|
|
if (!(def = xenDaemonParseSxprString(conn, sexprData, xendConfigVersion)))
|
|
goto fail;
|
|
|
|
if (!(gotxml = virDomainDefFormat(def, 0)))
|
|
goto fail;
|
|
|
|
if (STRNEQ(xmlData, gotxml)) {
|
|
virtTestDifference(stderr, xmlData, gotxml);
|
|
goto fail;
|
|
}
|
|
|
|
ret = 0;
|
|
|
|
fail:
|
|
free(gotxml);
|
|
virDomainDefFree(def);
|
|
if (conn)
|
|
virUnrefConnect(conn);
|
|
|
|
return ret;
|
|
}
|
|
|
|
struct testInfo {
|
|
const char *input;
|
|
const char *output;
|
|
int version;
|
|
};
|
|
|
|
static int testCompareHelper(const void *data) {
|
|
const struct testInfo *info = data;
|
|
char xml[PATH_MAX];
|
|
char args[PATH_MAX];
|
|
snprintf(xml, PATH_MAX, "%s/sexpr2xmldata/sexpr2xml-%s.xml",
|
|
abs_srcdir, info->input);
|
|
snprintf(args, PATH_MAX, "%s/sexpr2xmldata/sexpr2xml-%s.sexpr",
|
|
abs_srcdir, info->output);
|
|
return testCompareFiles(xml, args, info->version);
|
|
}
|
|
|
|
|
|
static int
|
|
mymain(int argc, char **argv)
|
|
{
|
|
int ret = 0;
|
|
char cwd[PATH_MAX];
|
|
|
|
progname = argv[0];
|
|
|
|
if (argc > 1) {
|
|
fprintf(stderr, "Usage: %s\n", progname);
|
|
return(EXIT_FAILURE);
|
|
}
|
|
|
|
abs_srcdir = getenv("abs_srcdir");
|
|
if (!abs_srcdir)
|
|
abs_srcdir = getcwd(cwd, sizeof(cwd));
|
|
|
|
if (argc > 1) {
|
|
fprintf(stderr, "Usage: %s\n", progname);
|
|
return(EXIT_FAILURE);
|
|
}
|
|
|
|
if (!(caps = testXenCapsInit()))
|
|
return(EXIT_FAILURE);
|
|
|
|
#define DO_TEST(in, out, version) \
|
|
do { \
|
|
struct testInfo info = { in, out, version }; \
|
|
virResetLastError(); \
|
|
if (virtTestRun("Xen SEXPR-2-XML " in " -> " out, \
|
|
1, testCompareHelper, &info) < 0) \
|
|
ret = -1; \
|
|
} while (0)
|
|
|
|
DO_TEST("pv", "pv", 1);
|
|
DO_TEST("fv", "fv", 1);
|
|
DO_TEST("pv", "pv", 2);
|
|
DO_TEST("fv-v2", "fv-v2", 2);
|
|
DO_TEST("pv-vfb-orig", "pv-vfb-orig", 2);
|
|
DO_TEST("pv-vfb-new", "pv-vfb-new", 3);
|
|
DO_TEST("pv-vfb-new-vncdisplay", "pv-vfb-new-vncdisplay", 3);
|
|
DO_TEST("pv-vfb-type-crash", "pv-vfb-type-crash", 3);
|
|
DO_TEST("fv-autoport", "fv-autoport", 3);
|
|
DO_TEST("pv-bootloader", "pv-bootloader", 1);
|
|
DO_TEST("pv-vcpus", "pv-vcpus", 1);
|
|
|
|
DO_TEST("disk-file", "disk-file", 2);
|
|
DO_TEST("disk-block", "disk-block", 2);
|
|
DO_TEST("disk-block-shareable", "disk-block-shareable", 2);
|
|
DO_TEST("disk-drv-blktap-raw", "disk-drv-blktap-raw", 2);
|
|
DO_TEST("disk-drv-blktap-qcow", "disk-drv-blktap-qcow", 2);
|
|
DO_TEST("disk-drv-blktap2-raw", "disk-drv-blktap2-raw", 2);
|
|
|
|
DO_TEST("curmem", "curmem", 2);
|
|
DO_TEST("net-routed", "net-routed", 2);
|
|
DO_TEST("net-bridged", "net-bridged", 2);
|
|
DO_TEST("net-e1000", "net-e1000", 2);
|
|
DO_TEST("bridge-ipaddr", "bridge-ipaddr", 3);
|
|
DO_TEST("no-source-cdrom", "no-source-cdrom", 2);
|
|
DO_TEST("pv-localtime", "pv-localtime", 2);
|
|
DO_TEST("pci-devs", "pci-devs", 2);
|
|
|
|
DO_TEST("fv-utc", "fv-utc", 1);
|
|
DO_TEST("fv-localtime", "fv-localtime", 1);
|
|
DO_TEST("fv-usbmouse", "fv-usbmouse", 1);
|
|
DO_TEST("fv-usbtablet", "fv-usbtablet", 1);
|
|
DO_TEST("fv-kernel", "fv-kernel", 1);
|
|
|
|
DO_TEST("fv-serial-null", "fv-serial-null", 1);
|
|
DO_TEST("fv-serial-file", "fv-serial-file", 1);
|
|
DO_TEST("fv-serial-stdio", "fv-serial-stdio", 1);
|
|
DO_TEST("fv-serial-pty", "fv-serial-pty", 1);
|
|
DO_TEST("fv-serial-pipe", "fv-serial-pipe", 1);
|
|
DO_TEST("fv-serial-tcp", "fv-serial-tcp", 1);
|
|
DO_TEST("fv-serial-udp", "fv-serial-udp", 1);
|
|
DO_TEST("fv-serial-tcp-telnet", "fv-serial-tcp-telnet", 1);
|
|
DO_TEST("fv-serial-unix", "fv-serial-unix", 1);
|
|
DO_TEST("fv-parallel-tcp", "fv-parallel-tcp", 1);
|
|
|
|
DO_TEST("fv-sound", "fv-sound", 1);
|
|
DO_TEST("fv-sound-all", "fv-sound-all", 1);
|
|
|
|
DO_TEST("fv-net-ioemu", "fv-net-ioemu", 1);
|
|
DO_TEST("fv-net-netfront", "fv-net-netfront", 1);
|
|
|
|
DO_TEST("boot-grub", "boot-grub", 1);
|
|
|
|
virCapabilitiesFree(caps);
|
|
|
|
return(ret==0 ? EXIT_SUCCESS : EXIT_FAILURE);
|
|
}
|
|
|
|
VIRT_TEST_MAIN(mymain)
|