From: Peter Krempa <pkrempa@redhat.com>
Date: Mon, 6 Jan 2020 11:27:40 +0000 (+0100)
Subject: qemu: backup: Move capability check after inactive check
X-Git-Tag: v6.0.0-rc1~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c314222a01ac0c58da50a8dd14641a17b8daa013;p=thirdparty%2Flibvirt.git

qemu: backup: Move capability check after inactive check

Inactive VM doesn't have qemuCaps set thus we'd never properly report
that VM backups are supported only for running VMs.

Move the capability check after the active check.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>
---

diff --git a/src/qemu/qemu_backup.c b/src/qemu/qemu_backup.c
index e7358082d5..c47de2f4a8 100644
--- a/src/qemu/qemu_backup.c
+++ b/src/qemu/qemu_backup.c
@@ -750,12 +750,6 @@ qemuBackupBegin(virDomainObjPtr vm,
 
     virCheckFlags(VIR_DOMAIN_BACKUP_BEGIN_REUSE_EXTERNAL, -1);
 
-    if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_INCREMENTAL_BACKUP)) {
-        virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
-                       _("incremental backup is not supported yet"));
-        return -1;
-    }
-
     if (!(def = virDomainBackupDefParseString(backupXML, priv->driver->xmlopt, 0)))
         return -1;
 
@@ -793,6 +787,12 @@ qemuBackupBegin(virDomainObjPtr vm,
         goto endjob;
     }
 
+    if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_INCREMENTAL_BACKUP)) {
+        virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
+                       _("incremental backup is not supported yet"));
+        goto endjob;
+    }
+
     if (priv->backup) {
         virReportError(VIR_ERR_OPERATION_INVALID, "%s",
                        _("another backup job is already running"));