From: Eugenio Pérez Date: Wed, 20 Jul 2022 16:05:49 +0000 (+0200) Subject: qemu: remove hardcoded migration fail for vDPA devices if we can ask QEMU X-Git-Tag: v8.6.0-rc1~49 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=v8.5.0-140-g2103807e33;p=thirdparty%2Flibvirt.git qemu: remove hardcoded migration fail for vDPA devices if we can ask QEMU vDPA devices will be migratable soon, so we shouldn't unconditionally block migration of any domain with a vDPA device. Instead, we should rely on QEMU to make the decision when that info is available from the query-migrate QMP command (QEMU versions too old to have that info in the results of query-migrate don't support migration of vDPA devices, so in that case we will continue to unconditionally block migration). Signed-off-by: Eugenio Pérez Reviewed-by: Jiri Denemark Reviewed-by: Laine Stump --- diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 87c26b4e2c..5d1e5f987b 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1455,9 +1455,11 @@ qemuMigrationSrcIsAllowed(virQEMUDriver *driver, int nsnapshots; int pauseReason; size_t i; + bool blockedReasonsCap = virQEMUCapsGet(priv->qemuCaps, + QEMU_CAPS_MIGRATION_BLOCKED_REASONS); - /* Ask qemu if it has a migration blocker */ - if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATION_BLOCKED_REASONS)) { + /* Ask qemu if it have a migration blocker */ + if (blockedReasonsCap) { g_auto(GStrv) blockers = NULL; if (qemuDomainGetMigrationBlockers(driver, vm, &blockers) < 0) return false; @@ -1576,7 +1578,7 @@ qemuMigrationSrcIsAllowed(virQEMUDriver *driver, virDomainNetDef *net = vm->def->nets[i]; qemuSlirp *slirp; - if (net->type == VIR_DOMAIN_NET_TYPE_VDPA) { + if (!blockedReasonsCap && net->type == VIR_DOMAIN_NET_TYPE_VDPA) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("vDPA devices cannot be migrated")); return false;