[libvirt PATCH v2 50/51] storage_adapter_conf: Use virXMLPropTristateXXX in virStorageAdapterParseXMLFCHost

Tim Wiederhake twiederh at redhat.com
Fri Mar 19 13:41:04 UTC 2021


Signed-off-by: Tim Wiederhake <twiederh at redhat.com>
---
 src/conf/storage_adapter_conf.c | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/src/conf/storage_adapter_conf.c b/src/conf/storage_adapter_conf.c
index 69062b4b58..a19920c8b2 100644
--- a/src/conf/storage_adapter_conf.c
+++ b/src/conf/storage_adapter_conf.c
@@ -64,28 +64,16 @@ static int
 virStorageAdapterParseXMLFCHost(xmlNodePtr node,
                                 virStorageAdapterFCHostPtr fchost)
 {
-    char *managed = NULL;
+    if (virXMLPropTristateBool(node, "managed", false, &fchost->managed) < 0)
+        return -1;
 
     fchost->parent = virXMLPropString(node, "parent");
-    if ((managed = virXMLPropString(node, "managed"))) {
-        int value;
-        if ((value = virTristateBoolTypeFromString(managed)) < 0) {
-            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                           _("unknown fc_host managed setting '%s'"),
-                           managed);
-            VIR_FREE(managed);
-            return -1;
-        }
-        fchost->managed = value;
-    }
-
     fchost->parent_wwnn = virXMLPropString(node, "parent_wwnn");
     fchost->parent_wwpn = virXMLPropString(node, "parent_wwpn");
     fchost->parent_fabric_wwn = virXMLPropString(node, "parent_fabric_wwn");
     fchost->wwpn = virXMLPropString(node, "wwpn");
     fchost->wwnn = virXMLPropString(node, "wwnn");
 
-    VIR_FREE(managed);
     return 0;
 }
 
-- 
2.26.2




More information about the libvir-list mailing list