From: Peter Krempa <pkrempa@redhat.com>
Date: Wed, 4 Sep 2019 11:20:41 +0000 (+0200)
Subject: qemu: migration: Switch to blockdev mode for non-shared storage migration
X-Git-Tag: v5.8.0-rc1~275
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ca18ebadc80ba7e7f7a2f2a421549107c171ad9;p=thirdparty%2Flibvirt.git

qemu: migration: Switch to blockdev mode for non-shared storage migration

When blockdev is used we always should use the blockdev mode for
non-shared storage migration.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index c13b21a0bb..6ff956b1f5 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -907,6 +907,7 @@ qemuMigrationSrcNBDStorageCopyOne(virQEMUDriverPtr driver,
                                   const char *tlsAlias,
                                   unsigned int flags)
 {
+    qemuDomainObjPrivatePtr priv = vm->privateData;
     qemuDomainDiskPrivatePtr diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk);
     qemuBlockJobDataPtr job = NULL;
     char *diskAlias = NULL;
@@ -921,7 +922,8 @@ qemuMigrationSrcNBDStorageCopyOne(virQEMUDriverPtr driver,
 
     qemuBlockJobSyncBegin(job);
 
-    if (flags & VIR_MIGRATE_TLS) {
+    if (flags & VIR_MIGRATE_TLS ||
+        virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV)) {
         rc = qemuMigrationSrcNBDStorageCopyBlockdev(driver, vm,
                                                     disk, diskAlias,
                                                     host, port,