From: Peter Krempa <pkrempa@redhat.com>
Date: Thu, 8 Sep 2022 10:41:49 +0000 (+0200)
Subject: qemu: migration: Always assume support for QEMU_CAPS_NBD_SERVER
X-Git-Tag: v8.8.0-rc1~45
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=94ff4f2f91020f5ec3c3693ff762af0e83423950;p=thirdparty%2Flibvirt.git

qemu: migration: Always assume support for QEMU_CAPS_NBD_SERVER

The NBD server (detected via 'nbd-server-start' qmp command) was added
to qemu in v1.3 and can't be compiled out.

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 5367b74de4..995364da02 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -3147,8 +3147,7 @@ qemuMigrationDstPrepareActive(virQEMUDriver *driver,
         goto error;
 
     if (mig->nbd &&
-        flags & (VIR_MIGRATE_NON_SHARED_DISK | VIR_MIGRATE_NON_SHARED_INC) &&
-        virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_NBD_SERVER)) {
+        flags & (VIR_MIGRATE_NON_SHARED_DISK | VIR_MIGRATE_NON_SHARED_INC)) {
         const char *nbdTLSAlias = NULL;
 
         if (flags & VIR_MIGRATE_TLS) {
@@ -3356,8 +3355,7 @@ qemuMigrationDstPrepareFresh(virQEMUDriver *driver,
         }
 
         if (mig->nbd &&
-            flags & (VIR_MIGRATE_NON_SHARED_DISK | VIR_MIGRATE_NON_SHARED_INC) &&
-            virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_NBD_SERVER))
+            flags & (VIR_MIGRATE_NON_SHARED_DISK | VIR_MIGRATE_NON_SHARED_INC))
             cookieFlags |= QEMU_MIGRATION_COOKIE_NBD;
     }