From 032a35893b08dcadfcd935b5f7ff603239e04829 Mon Sep 17 00:00:00 2001 From: Nikolay Shirokovskiy Date: Thu, 17 Dec 2020 15:27:41 +0300 Subject: [PATCH] libxl: adopt to VIR_DRV_SUPPORTS_FEATURE return -1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Otherwise in some places we can mistakenly report 'unsupported' error instead of root cause. So let's handle root cause explicitly from the macro. Signed-off-by: Nikolay Shirokovskiy Reviewed-by: Daniel P. Berrangé --- src/libxl/libxl_migration.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c index 6dc6812ee7..2925aaaa6d 100644 --- a/src/libxl/libxl_migration.c +++ b/src/libxl/libxl_migration.c @@ -1146,7 +1146,7 @@ libxlDomainMigrationSrcPerformP2P(libxlDriverPrivatePtr driver, unsigned int flags) { int ret = -1; - bool useParams; + int useParams; virConnectPtr dconn = NULL; virErrorPtr orig_err = NULL; libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver); @@ -1171,9 +1171,11 @@ libxlDomainMigrationSrcPerformP2P(libxlDriverPrivatePtr driver, VIR_DRV_FEATURE_MIGRATION_PARAMS); virObjectLock(vm); - if (!useParams) { - virReportError(VIR_ERR_OPERATION_FAILED, "%s", - _("Destination libvirt does not support migration with extensible parameters")); + if (useParams <= 0) { + if (useParams == 0) + virReportError(VIR_ERR_OPERATION_FAILED, "%s", + _("Destination libvirt does not support migration" + " with extensible parameters")); goto cleanup; }