From: Peter Krempa <pkrempa@redhat.com>
Date: Wed, 9 Aug 2023 12:10:14 +0000 (+0200)
Subject: qemuMigrationSrcBeginPhase: Properly report error when non-shared storage migration... 
X-Git-Tag: v9.7.0-rc1~149
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=deac6f017e9ffaae4060d461b87e0d61ddbb1e3a;p=thirdparty%2Flibvirt.git

qemuMigrationSrcBeginPhase: Properly report error when non-shared storage migration is requested over tunnel

When VIR_MIGRATE_TUNNELLED is used without
VIR_MIGRATE_NON_SHARED_DISK/VIR_MIGRATE_NON_SHARED_INC
an error was reported without actually returning failure.

This was caused by a refactor which dropped many error paths.

Fixes: 6111b235224
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index ed41a03851..a3fe6be4e9 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -2617,6 +2617,7 @@ qemuMigrationSrcBeginPhase(virQEMUDriver *driver,
         if (flags & VIR_MIGRATE_TUNNELLED) {
             virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
                            _("migration of non-shared storage is not supported with tunnelled migration and this QEMU"));
+            return NULL;
         }
 
         if (nmigrate_disks) {