From: Roman Bogorodskiy <bogorodskiy@gmail.com>
Date: Thu, 23 Apr 2015 06:25:11 +0000 (+0400)
Subject: bhyve: fix build in tests
X-Git-Tag: v1.2.15-rc1~71
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c42dbd8a18bb7a087f96bd7e177b0e508ed21ba5;p=thirdparty%2Flibvirt.git

bhyve: fix build in tests

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.
---

diff --git a/tests/bhyvexml2argvtest.c b/tests/bhyvexml2argvtest.c
index c5b068141d..26d00750fb 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 a1a3701745..2e742cf690 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;