conf: domain: Convert virDomainDiskDef's 'model' to virDomainDiskModel

Use the appropriate type for the variable and refactor the XML parser to
parse it correctly using virXMLPropEnum.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index fd933fefc85f940376ac5137f14a9b36572e4dbe..da0e7700ffc18161eeeabf63c7c1665c0a5dc624 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -9345,13 +9345,9 @@ virDomainDiskDefParseXML(virDomainXMLOption *xmlopt,
     }
     VIR_FREE(tmp);
 
-    if ((tmp = virXMLPropString(node, "model")) &&
-        (def->model = virDomainDiskModelTypeFromString(tmp)) < 0) {
-        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                       _("unknown disk model '%s'"), tmp);
+    if (virXMLPropEnum(node, "model", virDomainDiskModelTypeFromString,
+                       VIR_XML_PROP_OPTIONAL, &def->model) < 0)
         return NULL;
-    }
-    VIR_FREE(tmp);
 
     snapshot = virXMLPropString(node, "snapshot");
 

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 1b62af6d63037268b04a3b0d5a4198848bcd0895..a83d5b337fb9ac915eda21391fbac72482287275 100644 (file)
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -584,7 +584,7 @@ struct _virDomainDiskDef {
     int detect_zeroes; /* enum virDomainDiskDetectZeroes */
     char *domain_name; /* backend domain name */
     unsigned int queues;
-    int model; /* enum virDomainDiskModel */
+    virDomainDiskModel model;
     virDomainVirtioOptions *virtio;
 
     bool diskElementAuth;