From: Tim Wiederhake <twiederh@redhat.com>
Date: Wed, 7 Apr 2021 11:48:32 +0000 (+0200)
Subject: conf: Use virTristateXXX in virDomainActualNetDef
X-Git-Tag: v7.3.0-rc1~209
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f1d4cd5ab3fe4c3c321b70d0c576e8be097efb80;p=thirdparty%2Flibvirt.git

conf: Use virTristateXXX in virDomainActualNetDef

Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
---

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 008fb5db9d..c2dec23c3a 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -10574,14 +10574,15 @@ virDomainActualNetDefParseXML(xmlNodePtr node,
         goto error;
     }
 
-    trustGuestRxFilters = virXMLPropString(node, "trustGuestRxFilters");
-    if (trustGuestRxFilters &&
-        ((actual->trustGuestRxFilters
-          = virTristateBoolTypeFromString(trustGuestRxFilters)) <= 0)) {
-        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                       _("unknown trustGuestRxFilters value '%s'"),
-                       trustGuestRxFilters);
-        goto error;
+    if ((trustGuestRxFilters = virXMLPropString(node, "trustGuestRxFilters"))) {
+        int value;
+        if ((value = virTristateBoolTypeFromString(trustGuestRxFilters)) <= 0) {
+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                           _("unknown trustGuestRxFilters value '%s'"),
+                           trustGuestRxFilters);
+            goto error;
+        }
+        actual->trustGuestRxFilters = value;
     }
 
     virtPortNode = virXPathNode("./virtualport", ctxt);
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 0aa6eec27e..4ed3433682 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -995,7 +995,7 @@ struct _virDomainActualNetDef {
     virNetDevVPortProfile *virtPortProfile;
     virNetDevBandwidth *bandwidth;
     virNetDevVlan vlan;
-    int trustGuestRxFilters; /* enum virTristateBool */
+    virTristateBool trustGuestRxFilters;
     virTristateBool isolatedPort;
     unsigned int class_id; /* class ID for bandwidth 'floor' */
 };