From: Peter Krempa <pkrempa@redhat.com>
Date: Tue, 4 Sep 2018 13:48:48 +0000 (+0200)
Subject: conf: snapshot: Remove file format check from parser
X-Git-Tag: v5.0.0-rc1~149
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7129b9f3546be0b09f4dfe8656409720abd113d6;p=thirdparty%2Flibvirt.git

conf: snapshot: Remove file format check from parser

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>
---

diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c
index adba149241..5a511b4495 100644
--- a/src/conf/snapshot_conf.c
+++ b/src/conf/snapshot_conf.c
@@ -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 */