From: Jiri Denemark <jdenemar@redhat.com>
Date: Tue, 10 May 2022 13:20:25 +0000 (+0200)
Subject: qemu: Separate protocol checks from qemuMigrationJobSetPhase
X-Git-Tag: v8.5.0-rc1~155
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a5dc9bf96b7dfef7b17e1f7109ae0357900a041e;p=thirdparty%2Flibvirt.git

qemu: Separate protocol checks from qemuMigrationJobSetPhase

Into a new qemuMigrationCheckPhase helper, which can be reused in other
places.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
---

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index ae3927201f..efc1ff9d5f 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -139,9 +139,9 @@ qemuMigrationJobStart(virQEMUDriver *driver,
 }
 
 
-static void ATTRIBUTE_NONNULL(1)
-qemuMigrationJobSetPhase(virDomainObj *vm,
-                         qemuMigrationJobPhase phase)
+static int
+qemuMigrationCheckPhase(virDomainObj *vm,
+                        qemuMigrationJobPhase phase)
 {
     qemuDomainObjPrivate *priv = vm->privateData;
 
@@ -150,9 +150,20 @@ qemuMigrationJobSetPhase(virDomainObj *vm,
         VIR_ERROR(_("migration protocol going backwards %s => %s"),
                   qemuMigrationJobPhaseTypeToString(priv->job.phase),
                   qemuMigrationJobPhaseTypeToString(phase));
-        return;
+        return -1;
     }
 
+    return 0;
+}
+
+
+static void ATTRIBUTE_NONNULL(1)
+qemuMigrationJobSetPhase(virDomainObj *vm,
+                         qemuMigrationJobPhase phase)
+{
+    if (qemuMigrationCheckPhase(vm, phase) < 0)
+        return;
+
     qemuDomainObjSetJobPhase(vm, phase);
 }