conf: Use virTristateXXX in virDomainMemballoonDef

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 c8dee851ba0081b04f072929d32bf086faf7e3bd..c02d469e78516a07f9aae475a44edbcbc0ec5f50 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -14569,18 +14569,24 @@ virDomainMemballoonDefParseXML(virDomainXMLOption *xmlopt,
         goto error;
     }
 
-    if ((deflate = virXMLPropString(node, "autodeflate")) &&
-        (def->autodeflate = virTristateSwitchTypeFromString(deflate)) <= 0) {
-        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                       _("invalid autodeflate attribute value '%s'"), deflate);
-        goto error;
+    if ((deflate = virXMLPropString(node, "autodeflate"))) {
+        int value;
+        if ((value = virTristateSwitchTypeFromString(deflate)) <= 0) {
+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                           _("invalid autodeflate attribute value '%s'"), deflate);
+            goto error;
+        }
+        def->autodeflate = value;
     }
 
-    if ((freepage_reporting = virXMLPropString(node, "freePageReporting")) &&
-        (def->free_page_reporting = virTristateSwitchTypeFromString(freepage_reporting)) <= 0) {
-        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                       _("invalid freePageReporting attribute value '%s'"), freepage_reporting);
-        goto error;
+    if ((freepage_reporting = virXMLPropString(node, "freePageReporting"))) {
+        int value;
+        if ((value = virTristateSwitchTypeFromString(freepage_reporting)) <= 0) {
+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                           _("invalid freePageReporting attribute value '%s'"), freepage_reporting);
+            goto error;
+        }
+        def->free_page_reporting = value;
     }
 
     ctxt->node = node;

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index cec37923d8db4c8ff80e94da164cd3780e0c3a96..a4c07d7dfb6358b8c630757c781063bcbb854c2b 100644 (file)
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -1915,8 +1915,8 @@ struct _virDomainMemballoonDef {
     int model;
     virDomainDeviceInfo info;
     int period; /* seconds between collections */
-    int autodeflate; /* enum virTristateSwitch */
-    int free_page_reporting; /* enum virTristateSwitch */
+    virTristateSwitch autodeflate;
+    virTristateSwitch free_page_reporting;
     virDomainVirtioOptions *virtio;
 };