On Thu, Apr 23, 2015 at 10:55:12 +0400, Roman Bogorodskiy wrote:

Commit 835cf84 dropped expectedVirtTypes argument for virDomainDefParse*() functions, however bhyve tests still try to pass that to virDomainDefParseFile(), therefore build fails.

Fix build by fixing virDomainDefParseFile() usage. --- tests/bhyvexml2argvtest.c | 1 - tests/bhyvexml2xmltest.c | 1 - 2 files changed, 2 deletions(-)

diff --git a/tests/bhyvexml2argvtest.c b/tests/bhyvexml2argvtest.c index c5b0681..26d0075 100644 --- a/tests/bhyvexml2argvtest.c +++ b/tests/bhyvexml2argvtest.c @@ -32,7 +32,6 @@ static int testCompareXMLToArgvFiles(const char *xml, goto out;

if (!(vmdef = virDomainDefParseFile(xml, driver.caps, driver.xmlopt, - 1 << VIR_DOMAIN_VIRT_BHYVE, VIR_DOMAIN_DEF_PARSE_INACTIVE))) goto out;

diff --git a/tests/bhyvexml2xmltest.c b/tests/bhyvexml2xmltest.c index a1a3701..2e742cf 100644 --- a/tests/bhyvexml2xmltest.c +++ b/tests/bhyvexml2xmltest.c @@ -27,7 +27,6 @@ testCompareXMLToXMLFiles(const char *inxml, const char *outxml) goto fail;

if (!(def = virDomainDefParseString(inXmlData, driver.caps, driver.xmlopt, - 1 << VIR_DOMAIN_VIRT_BHYVE, VIR_DOMAIN_DEF_PARSE_INACTIVE))) goto fail;

ACK, this qualifies to be pushed without review under the build breaker rule. Peter