]> xenbits.xensource.com Git - libvirt.git/commitdiff
conf: snapshot: Remove file format check from parser
authorPeter Krempa <pkrempa@redhat.com>
Tue, 4 Sep 2018 13:48:48 +0000 (15:48 +0200)
committerPeter Krempa <pkrempa@redhat.com>
Wed, 5 Dec 2018 16:53:26 +0000 (17:53 +0100)
We already have a way stricter check in the code which is doing the
snapshot so duplicating it in the parser does not make much sense. Also
gets rid of an ugly ternary operator.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
src/conf/snapshot_conf.c

index adba1492412670fc145399a399da94684eda25a0..5a511b4495f689579c3f164240719a2f9c67193e 100644 (file)
@@ -159,17 +159,11 @@ virDomainSnapshotDiskDefParseXML(xmlNodePtr node,
         virDomainDiskSourceParse(cur, ctxt, def->src, flags, xmlopt) < 0)
         goto cleanup;
 
-    if ((driver = virXPathString("string(./driver/@type)", ctxt))) {
-        def->src->format = virStorageFileFormatTypeFromString(driver);
-        if (def->src->format < VIR_STORAGE_FILE_BACKING) {
+    if ((driver = virXPathString("string(./driver/@type)", ctxt)) &&
+        (def->src->format = virStorageFileFormatTypeFromString(driver)) <= 0) {
             virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                           def->src->format <= 0
-                           ? _("unknown disk snapshot driver '%s'")
-                           : _("disk format '%s' lacks backing file "
-                               "support"),
-                           driver);
+                           _("unknown disk snapshot driver '%s'"), driver);
             goto cleanup;
-        }
     }
 
     /* validate that the passed path is absolute */