From: Cole Robinson <crobinso@redhat.com>
Date: Wed, 17 Apr 2019 14:38:57 +0000 (-0400)
Subject: test: match qemu VIR_DOMAIN_DEF_FEATURE* usage
X-Git-Tag: v5.3.0-rc2^0
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6354c651cea766320d7e209e11a54cc66b8b8298;p=thirdparty%2Flibvirt.git

test: match qemu VIR_DOMAIN_DEF_FEATURE* usage

Match the XML feature usage of the qemu driver, so the test driver
doesn't reject things like <os firmware='efi'/>.

Particularly VIR_DOMAIN_DEF_FEATURE_NET_MODEL_STRING is needed to
prevent regressions for test suite users with net model strings that
aren't in the virDomainNetModel enum yet

Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Cole Robinson <crobinso@redhat.com>
---

diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index d5eecf4b7f..24c1dc5adf 100644
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -390,6 +390,14 @@ testDriverNew(void)
         .parse = testDomainDefNamespaceParse,
         .free = testDomainDefNamespaceFree,
     };
+    virDomainDefParserConfig config = {
+        .features = VIR_DOMAIN_DEF_FEATURE_MEMORY_HOTPLUG |
+                    VIR_DOMAIN_DEF_FEATURE_OFFLINE_VCPUPIN |
+                    VIR_DOMAIN_DEF_FEATURE_INDIVIDUAL_VCPUS |
+                    VIR_DOMAIN_DEF_FEATURE_USER_ALIAS |
+                    VIR_DOMAIN_DEF_FEATURE_FW_AUTOSELECT |
+                    VIR_DOMAIN_DEF_FEATURE_NET_MODEL_STRING,
+    };
     testDriverPtr ret;
 
     if (testDriverInitialize() < 0)
@@ -398,7 +406,7 @@ testDriverNew(void)
     if (!(ret = virObjectLockableNew(testDriverClass)))
         return NULL;
 
-    if (!(ret->xmlopt = virDomainXMLOptionNew(NULL, NULL, &ns, NULL, NULL)) ||
+    if (!(ret->xmlopt = virDomainXMLOptionNew(&config, NULL, &ns, NULL, NULL)) ||
         !(ret->eventState = virObjectEventStateNew()) ||
         !(ret->ifaces = virInterfaceObjListNew()) ||
         !(ret->domains = virDomainObjListNew()) ||