From nobody Sun Feb 8 20:36:04 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1656589580; cv=none; d=zohomail.com; s=zohoarc; b=j58hcfFpYVxjm6N55UYyp8S72X1pTD5gn/Zr9RcHcxm2PqEVsW5kg/culEFwhM0E7prLmIb3NNYbVqRY6+1Vs9+ysZsIiKeCmWT8sojeok2MyMBJJaKOpbGWMsFmFEM3X1uJxK84CbsXiG1TGy/63hpWUbNUij0aE9i01zNTcjs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1656589580; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=lt9mIM9dzjbEEWCrxFSpBt44QURdRqonAfuh/4G8AJM=; b=PkakVmafIuSk877q9ri2oP7k3vZX89sjKJl0CWGNd0HA4MF5G1HFRLaiSvq2LZ5EiD1gzWAzYBW4SpHAXujIUHT569uCuXOXgUxISvcqtHVGQoBqgNDLh/JW2IZP/z/rhGnrscNytz/zP+eprol5/MM9ntw1bGn/Hcxlz8J+mY8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1656589580102198.20780650326435; Thu, 30 Jun 2022 04:46:20 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-152-xUJDmZJtNxmAKHS9WmPHNQ-1; Thu, 30 Jun 2022 07:45:52 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7F034805F3F; Thu, 30 Jun 2022 11:45:49 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6BD4640CFD0B; Thu, 30 Jun 2022 11:45:49 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id B7CF81947070; Thu, 30 Jun 2022 11:45:48 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 0B1241947064 for ; Thu, 30 Jun 2022 11:45:45 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id E12A82166B29; Thu, 30 Jun 2022 11:45:44 +0000 (UTC) Received: from virval.usersys.redhat.com (unknown [10.43.2.227]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A80CB2166B26 for ; Thu, 30 Jun 2022 11:45:44 +0000 (UTC) Received: by virval.usersys.redhat.com (Postfix, from userid 500) id A1520240175; Thu, 30 Jun 2022 13:45:43 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1656589579; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=lt9mIM9dzjbEEWCrxFSpBt44QURdRqonAfuh/4G8AJM=; b=UUkUVUS7aLijzXDVQfY2zHY1c3kTpYP5ITNWz84AwzSph9Dflj7qVZ2OeywSivkfI1XdaI lIdzPEjUd02sdJY7szcYg9zfC3ZH6+tIrVR/DrjBMLkOabfbOeGGvmkx3p4YxZ/xswmvoH JrFpthlNHMvAkWrnLuNRdg5CQdzChyU= X-MC-Unique: xUJDmZJtNxmAKHS9WmPHNQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Jiri Denemark To: libvir-list@redhat.com Subject: [libvirt PATCH 1/4] qemu: Pass migration flags to qemuMigrationParamsApply Date: Thu, 30 Jun 2022 13:45:37 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1656589581186100001 Content-Type: text/plain; charset="utf-8" The flags will later be used to determine which parameters should actually be applied. Signed-off-by: Jiri Denemark --- src/qemu/qemu_driver.c | 6 +++--- src/qemu/qemu_migration.c | 8 ++++---- src/qemu/qemu_migration_params.c | 11 ++++++++--- src/qemu/qemu_migration_params.h | 3 ++- 4 files changed, 17 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 3b5c3db67c..97c6ed95af 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -13078,7 +13078,7 @@ qemuDomainMigrateSetMaxDowntime(virDomainPtr dom, goto endjob; =20 if (qemuMigrationParamsApply(driver, vm, VIR_ASYNC_JOB_NONE, - migParams) < 0) + migParams, 0) < 0) goto endjob; } else { qemuDomainObjEnterMonitor(driver, vm); @@ -13260,7 +13260,7 @@ qemuDomainMigrateSetCompressionCache(virDomainPtr d= om, goto endjob; =20 if (qemuMigrationParamsApply(driver, vm, VIR_ASYNC_JOB_NONE, - migParams) < 0) + migParams, 0) < 0) goto endjob; } else { qemuDomainObjEnterMonitor(driver, vm); @@ -13347,7 +13347,7 @@ qemuDomainMigrateSetMaxSpeed(virDomainPtr dom, goto endjob; =20 if (qemuMigrationParamsApply(driver, vm, VIR_ASYNC_JOB_NONE, - migParams) < 0) + migParams, 0) < 0) goto endjob; } else { int rc; diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 9a10ce4abe..4ca2f8b600 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -3213,7 +3213,7 @@ qemuMigrationDstPrepareActive(virQEMUDriver *driver, } =20 if (qemuMigrationParamsApply(driver, vm, VIR_ASYNC_JOB_MIGRATION_IN, - migParams) < 0) + migParams, flags) < 0) goto error; =20 if (mig->nbd && @@ -4801,7 +4801,7 @@ qemuMigrationSrcRun(virQEMUDriver *driver, goto error; =20 if (qemuMigrationParamsApply(driver, vm, VIR_ASYNC_JOB_MIGRATION_OUT, - migParams) < 0) + migParams, flags) < 0) goto error; =20 if (flags & VIR_MIGRATE_ZEROCOPY) { @@ -6895,7 +6895,7 @@ qemuMigrationSrcToFile(virQEMUDriver *driver, virDoma= inObj *vm, QEMU_DOMAIN_MIG_BANDWIDTH_MAX * 1024= * 1024) < 0) return -1; =20 - if (qemuMigrationParamsApply(driver, vm, asyncJob, migParams) < 0) + if (qemuMigrationParamsApply(driver, vm, asyncJob, migParams, 0) <= 0) return -1; =20 priv->migMaxBandwidth =3D QEMU_DOMAIN_MIG_BANDWIDTH_MAX; @@ -6991,7 +6991,7 @@ qemuMigrationSrcToFile(virQEMUDriver *driver, virDoma= inObj *vm, QEMU_MIGRATION_PARAM_MAX_BANDWID= TH, saveMigBandwidth * 1024 * 1024) = =3D=3D 0) ignore_value(qemuMigrationParamsApply(driver, vm, asyncJob, - migParams)); + migParams, 0)); } else { if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) =3D= =3D 0) { qemuMonitorSetMigrationSpeed(priv->mon, saveMigBandwidth); diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_par= ams.c index cc66ed8229..398c07efd0 100644 --- a/src/qemu/qemu_migration_params.c +++ b/src/qemu/qemu_migration_params.c @@ -833,8 +833,10 @@ qemuMigrationCapsToJSON(virBitmap *caps, * @vm: domain object * @asyncJob: migration job * @migParams: migration parameters to send to QEMU + * @apiFlags: migration flags, some of them may affect which parameters ar= e applied * - * Send all parameters stored in @migParams to QEMU. + * Send parameters stored in @migParams to QEMU. If @apiFlags is non-zero,= some + * parameters that do not make sense for the enabled flags will be ignored. * * Returns 0 on success, -1 on failure. */ @@ -842,7 +844,8 @@ int qemuMigrationParamsApply(virQEMUDriver *driver, virDomainObj *vm, int asyncJob, - qemuMigrationParams *migParams) + qemuMigrationParams *migParams, + unsigned long apiFlags G_GNUC_UNUSED) { qemuDomainObjPrivate *priv =3D vm->privateData; bool xbzrleCacheSize_old =3D false; @@ -1245,7 +1248,9 @@ qemuMigrationParamsReset(virQEMUDriver *driver, if (!virDomainObjIsActive(vm) || !origParams) goto cleanup; =20 - if (qemuMigrationParamsApply(driver, vm, asyncJob, origParams) < 0) + /* Do not pass apiFlags to qemuMigrationParamsApply here to make sure = all + * parameters and capabilities are reset. */ + if (qemuMigrationParamsApply(driver, vm, asyncJob, origParams, 0) < 0) goto cleanup; =20 qemuMigrationParamsResetTLS(driver, vm, asyncJob, origParams, apiFlags= ); diff --git a/src/qemu/qemu_migration_params.h b/src/qemu/qemu_migration_par= ams.h index d1184acded..9e990e09bd 100644 --- a/src/qemu/qemu_migration_params.h +++ b/src/qemu/qemu_migration_params.h @@ -98,7 +98,8 @@ int qemuMigrationParamsApply(virQEMUDriver *driver, virDomainObj *vm, int asyncJob, - qemuMigrationParams *migParams); + qemuMigrationParams *migParams, + unsigned long apiFlags); =20 int qemuMigrationParamsEnableTLS(virQEMUDriver *driver, --=20 2.35.1