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

conf: Use virTristateXXX in virStorageAdapterFCHost

Note that the comment for virStorageAdapterFCHost::managed was wrong.

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

diff --git a/src/conf/storage_adapter_conf.c b/src/conf/storage_adapter_conf.c
index 5b71c79d24..142489f6cd 100644
--- a/src/conf/storage_adapter_conf.c
+++ b/src/conf/storage_adapter_conf.c
@@ -68,13 +68,15 @@ virStorageAdapterParseXMLFCHost(xmlNodePtr node,
 
     fchost->parent = virXMLPropString(node, "parent");
     if ((managed = virXMLPropString(node, "managed"))) {
-        if ((fchost->managed = virTristateBoolTypeFromString(managed)) < 0) {
+        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");
diff --git a/src/conf/storage_adapter_conf.h b/src/conf/storage_adapter_conf.h
index ec7e9cc98f..e6d9c864cd 100644
--- a/src/conf/storage_adapter_conf.h
+++ b/src/conf/storage_adapter_conf.h
@@ -49,7 +49,7 @@ struct _virStorageAdapterFCHost {
     char *parent_fabric_wwn;
     char *wwnn;
     char *wwpn;
-    int managed;        /* enum virTristateSwitch */
+    virTristateBool managed;
 };
 
 typedef struct _virStorageAdapter virStorageAdapter;