From: Peter Krempa <pkrempa@redhat.com>
Date: Tue, 24 Nov 2020 07:32:32 +0000 (+0100)
Subject: qemu: migration: Forbid tunnelled non-shared storage migration with -blockdev
X-Git-Tag: v6.10.0-rc1~30
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f8867ddb05b742aff536eb9917f5ef3f97b18fbf;p=thirdparty%2Flibvirt.git

qemu: migration: Forbid tunnelled non-shared storage migration with -blockdev

qemu's internals were not prepared for switching to -blockdev for the
legacy storage migration. Add a proper error message since qemu is
unlikely to attempt fixing the old protocol.

Resolves: https://gitlab.com/libvirt/libvirt/-/issues/65
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 13d73638f4..2be0fc29ae 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -2220,6 +2220,12 @@ qemuMigrationSrcBeginPhase(virQEMUDriverPtr driver,
 
     if (flags & (VIR_MIGRATE_NON_SHARED_DISK | VIR_MIGRATE_NON_SHARED_INC)) {
         if (flags & VIR_MIGRATE_TUNNELLED) {
+            if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV)) {
+                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) {
                 virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
                                _("Selecting disks to migrate is not implemented for tunnelled migration"));