[PATCH 3/8] qemu: migration: Always assume support for QEMU_CAPS_NBD_SERVER

[Peter Krempa]

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 at redhat.com>
---
 src/qemu/qemu_migration.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

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;
     }

-- 
2.37.1