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

conf: Use virTristateXXX in virStorageSourceNVMeDef

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 1bee0c78ab..410d372382 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -8492,12 +8492,14 @@ virDomainDiskSourceNVMeParse(xmlNodePtr node,
     }
 
     if ((managed = virXMLPropString(node, "managed"))) {
-        if ((nvme->managed = virTristateBoolTypeFromString(managed)) <= 0) {
+        int value;
+        if ((value = virTristateBoolTypeFromString(managed)) <= 0) {
             virReportError(VIR_ERR_XML_ERROR,
                            _("malformed managed value '%s'"),
                            managed);
             return -1;
         }
+        nvme->managed = value;
     }
 
     if (!(address = virXPathNode("./address", ctxt))) {
diff --git a/src/conf/storage_source_conf.h b/src/conf/storage_source_conf.h
index 6f9dae2d66..389c7b56d1 100644
--- a/src/conf/storage_source_conf.h
+++ b/src/conf/storage_source_conf.h
@@ -242,7 +242,7 @@ struct _virStorageSourceInitiatorDef {
 typedef struct _virStorageSourceNVMeDef virStorageSourceNVMeDef;
 struct _virStorageSourceNVMeDef {
     unsigned long long namespc;
-    int managed; /* enum virTristateBool */
+    virTristateBool managed;
     virPCIDeviceAddress pciAddr;
 
     /* Don't forget to update virStorageSourceNVMeDefCopy */