提交 548f21d0 编写于 作者: R Roman Bogorodskiy

tests: use virBhyveCapsBuild in bhyvexml2argv test

As we can use virBhyveCapsBuild() now, replace
testBhyveBuildCapabilities() with it.
上级 d1e55de3
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
# include "datatypes.h" # include "datatypes.h"
# include "bhyve/bhyve_capabilities.h"
# include "bhyve/bhyve_utils.h" # include "bhyve/bhyve_utils.h"
# include "bhyve/bhyve_command.h" # include "bhyve/bhyve_command.h"
...@@ -13,33 +14,6 @@ ...@@ -13,33 +14,6 @@
static bhyveConn driver; static bhyveConn driver;
static virCapsPtr
testBhyveBuildCapabilities(void)
{
virCapsPtr caps;
virCapsGuestPtr guest;
if ((caps = virCapabilitiesNew(virArchFromHost(),
0, 0)) == NULL)
return NULL;
if ((guest = virCapabilitiesAddGuest(caps, "hvm",
VIR_ARCH_X86_64,
"bhyve",
NULL, 0, NULL)) == NULL)
goto error;
if (virCapabilitiesAddGuestDomain(guest,
"bhyve", NULL, NULL, 0, NULL) == NULL)
goto error;
return caps;
error:
virObjectUnref(caps);
return NULL;
}
static int testCompareXMLToArgvFiles(const char *xml, static int testCompareXMLToArgvFiles(const char *xml,
const char *cmdline) const char *cmdline)
{ {
...@@ -114,7 +88,7 @@ mymain(void) ...@@ -114,7 +88,7 @@ mymain(void)
{ {
int ret = 0; int ret = 0;
if ((driver.caps = testBhyveBuildCapabilities()) == NULL) if ((driver.caps = virBhyveCapsBuild()) == NULL)
return EXIT_FAILURE; return EXIT_FAILURE;
if ((driver.xmlopt = virDomainXMLOptionNew(NULL, NULL, NULL)) == NULL) if ((driver.xmlopt = virDomainXMLOptionNew(NULL, NULL, NULL)) == NULL)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册