NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

qemu: migration: Always assume support for QEMU_CAPS_NBD_SERVER

Browse Source 
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>
This commit is contained in:
Peter Krempa 2022-09-08 12:41:49 +02:00
parent 4e473b8618
commit 94ff4f2f91
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/qemu/qemu_migration.c
View File

@ -3147,8 +3147,7 @@ qemuMigrationDstPrepareActive(virQEMUDriver *driver,
goto error; goto error;
if (mig->nbd && if (mig->nbd &&
flags & (VIR_MIGRATE_NON_SHARED_DISK | VIR_MIGRATE_NON_SHARED_INC) && flags & (VIR_MIGRATE_NON_SHARED_DISK | VIR_MIGRATE_NON_SHARED_INC)) {
virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_NBD_SERVER)) {
const char *nbdTLSAlias = NULL; const char *nbdTLSAlias = NULL;
if (flags & VIR_MIGRATE_TLS) { if (flags & VIR_MIGRATE_TLS) {
@ -3356,8 +3355,7 @@ qemuMigrationDstPrepareFresh(virQEMUDriver *driver,
} }
if (mig->nbd && if (mig->nbd &&
flags & (VIR_MIGRATE_NON_SHARED_DISK | VIR_MIGRATE_NON_SHARED_INC) && flags & (VIR_MIGRATE_NON_SHARED_DISK | VIR_MIGRATE_NON_SHARED_INC))
virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_NBD_SERVER))
cookieFlags |= QEMU_MIGRATION_COOKIE_NBD; cookieFlags |= QEMU_MIGRATION_COOKIE_NBD;
} }