mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-25 15:15:25 +00:00
6c2e7d0b17
Update bhyveBuildDiskArgStr to support volumes: - Make virBhyveProcessBuildBhyveCmd and virBhyveProcessBuildLoadCmd take virConnectPtr as the first argument instead of bhyveConnPtr as virConnectPtr is needed for virStorageTranslateDiskSourcePool, - Add virStorageTranslateDiskSourcePool call to virBhyveProcessBuildBhyveCmd and virBhyveProcessBuildLoadCmd, - Allow disks of type VIR_STORAGE_TYPE_VOLUME
132 lines
2.9 KiB
C
132 lines
2.9 KiB
C
#include <config.h>
|
|
|
|
#include "testutils.h"
|
|
|
|
#ifdef WITH_BHYVE
|
|
|
|
# include "datatypes.h"
|
|
|
|
# include "bhyve/bhyve_capabilities.h"
|
|
# include "bhyve/bhyve_utils.h"
|
|
# include "bhyve/bhyve_command.h"
|
|
|
|
# define VIR_FROM_THIS VIR_FROM_BHYVE
|
|
|
|
static bhyveConn driver;
|
|
|
|
static int testCompareXMLToArgvFiles(const char *xml,
|
|
const char *cmdline)
|
|
{
|
|
char *expectargv = NULL;
|
|
int len;
|
|
char *actualargv = NULL;
|
|
virDomainDefPtr vmdef = NULL;
|
|
virDomainObj vm;
|
|
virCommandPtr cmd = NULL;
|
|
virConnectPtr conn;
|
|
int ret = -1;
|
|
|
|
if (!(conn = virGetConnect()))
|
|
goto out;
|
|
|
|
if (!(vmdef = virDomainDefParseFile(xml, driver.caps, driver.xmlopt,
|
|
1 << VIR_DOMAIN_VIRT_BHYVE,
|
|
VIR_DOMAIN_XML_INACTIVE)))
|
|
goto out;
|
|
|
|
vm.def = vmdef;
|
|
|
|
if (!(cmd = virBhyveProcessBuildBhyveCmd(conn, vmdef, false)))
|
|
goto out;
|
|
|
|
if (!(actualargv = virCommandToString(cmd)))
|
|
goto out;
|
|
|
|
len = virtTestLoadFile(cmdline, &expectargv);
|
|
if (len < 0)
|
|
goto out;
|
|
|
|
if (len && expectargv[len - 1] == '\n')
|
|
expectargv[len - 1] = '\0';
|
|
|
|
if (STRNEQ(expectargv, actualargv)) {
|
|
virtTestDifference(stderr, expectargv, actualargv);
|
|
goto out;
|
|
}
|
|
|
|
ret = 0;
|
|
|
|
out:
|
|
VIR_FREE(expectargv);
|
|
VIR_FREE(actualargv);
|
|
virCommandFree(cmd);
|
|
virDomainDefFree(vmdef);
|
|
return ret;
|
|
}
|
|
|
|
static int
|
|
testCompareXMLToArgvHelper(const void *data)
|
|
{
|
|
int ret = -1;
|
|
const char *name = data;
|
|
char *xml = NULL;
|
|
char *args = NULL;
|
|
|
|
if (virAsprintf(&xml, "%s/bhyvexml2argvdata/bhyvexml2argv-%s.xml",
|
|
abs_srcdir, name) < 0 ||
|
|
virAsprintf(&args, "%s/bhyvexml2argvdata/bhyvexml2argv-%s.args",
|
|
abs_srcdir, name) < 0)
|
|
goto cleanup;
|
|
|
|
ret = testCompareXMLToArgvFiles(xml, args);
|
|
|
|
cleanup:
|
|
VIR_FREE(xml);
|
|
VIR_FREE(args);
|
|
return ret;
|
|
}
|
|
|
|
static int
|
|
mymain(void)
|
|
{
|
|
int ret = 0;
|
|
|
|
if ((driver.caps = virBhyveCapsBuild()) == NULL)
|
|
return EXIT_FAILURE;
|
|
|
|
if ((driver.xmlopt = virDomainXMLOptionNew(NULL, NULL, NULL)) == NULL)
|
|
return EXIT_FAILURE;
|
|
|
|
# define DO_TEST(name) \
|
|
do { \
|
|
if (virtTestRun("BHYVE XML-2-ARGV " name, \
|
|
testCompareXMLToArgvHelper, name) < 0) \
|
|
ret = -1; \
|
|
} while (0)
|
|
|
|
|
|
DO_TEST("base");
|
|
DO_TEST("acpiapic");
|
|
DO_TEST("disk-cdrom");
|
|
DO_TEST("disk-virtio");
|
|
DO_TEST("macaddr");
|
|
DO_TEST("serial");
|
|
DO_TEST("console");
|
|
|
|
virObjectUnref(driver.caps);
|
|
virObjectUnref(driver.xmlopt);
|
|
|
|
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
|
|
}
|
|
|
|
VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/bhyvexml2argvmock.so")
|
|
|
|
#else
|
|
|
|
int main(void)
|
|
{
|
|
return EXIT_AM_SKIP;
|
|
}
|
|
|
|
#endif /* WITH_BHYVE */
|