From nobody Tue May 14 20:37:47 2024 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 Reviewed-by: Michal Privoznik --- 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 From nobody Tue May 14 20:37:47 2024 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=1656589555; cv=none; d=zohomail.com; s=zohoarc; b=NwNwVykvGxLnqmvegjvRQjRtvjkNBQ3QsYj8k7XQt5TZxrxLB37h7T9zKAJZGRsFFvoOj0Q9rvP0oF3MeJd8OaydqVA3skS04WsQr8tTEeh2ACvx89VWDY5geiP2nZS+ucaAHFEZuSKMi+T13JHt9dvcyGOjWt0Q4ikouYQD22I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1656589555; 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=9L2A2EjRN27ZhGJyPWK20N7nNksQNoerLC1TDQ7OQZM=; b=UPMDXlVSn7m31nQlysvsh84WMIejOOdooZZc1vpIJHEUu6y3S9LMLUxlM0EkUjBpRy8vtLjNhAxEpHmXcX/THf57/LSPEnwneArMuECMRQ/IBq4DXJrv7LqcZI/YKx67zUT/JlQN94iOIqLKEt2uV8wJFWhwXiLfoXnnE3Phk4U= 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 1656589554785270.2168227739878; Thu, 30 Jun 2022 04:45:54 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-408-UAaOlwrvPyKj1WCRV8bKDQ-1; Thu, 30 Jun 2022 07:45:51 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 23E7A380117C; 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 0D044492CA4; 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 5D0CC1947BA3; Thu, 30 Jun 2022 11:45:46 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 0310D1947061 for ; Thu, 30 Jun 2022 11:45:45 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id E5C7C1121314; 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 A95C8112131B for ; Thu, 30 Jun 2022 11:45:44 +0000 (UTC) Received: by virval.usersys.redhat.com (Postfix, from userid 500) id A2A4C240776; 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=1656589553; 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=9L2A2EjRN27ZhGJyPWK20N7nNksQNoerLC1TDQ7OQZM=; b=bYjiKb3eX3DBprvcB7OJBAwpRiYJdmmt7IPL/Xmi4VucwCcWl4Us03Xl2riz6+9G+qGGsP djGMxk+THhHS5VZxijUvrmQkwlbmokHq+isGtPhUg6bqY4pjwZ1T56+CCyAkbATptalAFL K0tgoZxrI5LBDR30FZVNqM9PJIXKzc4= X-MC-Unique: UAaOlwrvPyKj1WCRV8bKDQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Jiri Denemark To: libvir-list@redhat.com Subject: [libvirt PATCH 2/4] qemu_migration_params: Replace qemuMigrationParamTypes array Date: Thu, 30 Jun 2022 13:45:38 +0200 Message-Id: <262ccf62efea21fd6f63f25976e73a82fb226ebe.1656589462.git.jdenemar@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 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.85 on 10.11.54.9 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: 1656589556981100002 Content-Type: text/plain; charset="utf-8" We will need to annotate individual parameters a bit more than just noting their type. Let's introduce qemuMigrationParamInfo replacing simple qemuMigrationParamTypes with an array of structs. Signed-off-by: Jiri Denemark Reviewed-by: Michal Privoznik --- src/qemu/qemu_migration_params.c | 77 ++++++++++++++++++++++---------- 1 file changed, 54 insertions(+), 23 deletions(-) diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_par= ams.c index 398c07efd0..a68aed9aa4 100644 --- a/src/qemu/qemu_migration_params.c +++ b/src/qemu/qemu_migration_params.c @@ -138,6 +138,11 @@ struct _qemuMigrationParamsTPMapItem { int party; /* bit-wise OR of qemuMigrationParty */ }; =20 +typedef struct _qemuMigrationParamInfoItem qemuMigrationParamInfoItem; +struct _qemuMigrationParamInfoItem { + qemuMigrationParamType type; +}; + /* Migration capabilities which should always be enabled as long as they * are supported by QEMU. If the capability is supposed to be enabled on b= oth * sides of migration, it won't be enabled unless both sides support it. @@ -224,22 +229,48 @@ static const qemuMigrationParamsTPMapItem qemuMigrati= onParamsTPMap[] =3D { .party =3D QEMU_MIGRATION_SOURCE}, }; =20 -static const qemuMigrationParamType qemuMigrationParamTypes[] =3D { - [QEMU_MIGRATION_PARAM_COMPRESS_LEVEL] =3D QEMU_MIGRATION_PARAM_TYPE_IN= T, - [QEMU_MIGRATION_PARAM_COMPRESS_THREADS] =3D QEMU_MIGRATION_PARAM_TYPE_= INT, - [QEMU_MIGRATION_PARAM_DECOMPRESS_THREADS] =3D QEMU_MIGRATION_PARAM_TYP= E_INT, - [QEMU_MIGRATION_PARAM_THROTTLE_INITIAL] =3D QEMU_MIGRATION_PARAM_TYPE_= INT, - [QEMU_MIGRATION_PARAM_THROTTLE_INCREMENT] =3D QEMU_MIGRATION_PARAM_TYP= E_INT, - [QEMU_MIGRATION_PARAM_TLS_CREDS] =3D QEMU_MIGRATION_PARAM_TYPE_STRING, - [QEMU_MIGRATION_PARAM_TLS_HOSTNAME] =3D QEMU_MIGRATION_PARAM_TYPE_STRI= NG, - [QEMU_MIGRATION_PARAM_MAX_BANDWIDTH] =3D QEMU_MIGRATION_PARAM_TYPE_ULL, - [QEMU_MIGRATION_PARAM_DOWNTIME_LIMIT] =3D QEMU_MIGRATION_PARAM_TYPE_UL= L, - [QEMU_MIGRATION_PARAM_BLOCK_INCREMENTAL] =3D QEMU_MIGRATION_PARAM_TYPE= _BOOL, - [QEMU_MIGRATION_PARAM_XBZRLE_CACHE_SIZE] =3D QEMU_MIGRATION_PARAM_TYPE= _ULL, - [QEMU_MIGRATION_PARAM_MAX_POSTCOPY_BANDWIDTH] =3D QEMU_MIGRATION_PARAM= _TYPE_ULL, - [QEMU_MIGRATION_PARAM_MULTIFD_CHANNELS] =3D QEMU_MIGRATION_PARAM_TYPE_= INT, +static const qemuMigrationParamInfoItem qemuMigrationParamInfo[] =3D { + [QEMU_MIGRATION_PARAM_COMPRESS_LEVEL] =3D { + .type =3D QEMU_MIGRATION_PARAM_TYPE_INT, + }, + [QEMU_MIGRATION_PARAM_COMPRESS_THREADS] =3D { + .type =3D QEMU_MIGRATION_PARAM_TYPE_INT, + }, + [QEMU_MIGRATION_PARAM_DECOMPRESS_THREADS] =3D { + .type =3D QEMU_MIGRATION_PARAM_TYPE_INT, + }, + [QEMU_MIGRATION_PARAM_THROTTLE_INITIAL] =3D { + .type =3D QEMU_MIGRATION_PARAM_TYPE_INT, + }, + [QEMU_MIGRATION_PARAM_THROTTLE_INCREMENT] =3D { + .type =3D QEMU_MIGRATION_PARAM_TYPE_INT, + }, + [QEMU_MIGRATION_PARAM_TLS_CREDS] =3D { + .type =3D QEMU_MIGRATION_PARAM_TYPE_STRING, + }, + [QEMU_MIGRATION_PARAM_TLS_HOSTNAME] =3D { + .type =3D QEMU_MIGRATION_PARAM_TYPE_STRING, + }, + [QEMU_MIGRATION_PARAM_MAX_BANDWIDTH] =3D { + .type =3D QEMU_MIGRATION_PARAM_TYPE_ULL, + }, + [QEMU_MIGRATION_PARAM_DOWNTIME_LIMIT] =3D { + .type =3D QEMU_MIGRATION_PARAM_TYPE_ULL, + }, + [QEMU_MIGRATION_PARAM_BLOCK_INCREMENTAL] =3D { + .type =3D QEMU_MIGRATION_PARAM_TYPE_BOOL, + }, + [QEMU_MIGRATION_PARAM_XBZRLE_CACHE_SIZE] =3D { + .type =3D QEMU_MIGRATION_PARAM_TYPE_ULL, + }, + [QEMU_MIGRATION_PARAM_MAX_POSTCOPY_BANDWIDTH] =3D { + .type =3D QEMU_MIGRATION_PARAM_TYPE_ULL, + }, + [QEMU_MIGRATION_PARAM_MULTIFD_CHANNELS] =3D { + .type =3D QEMU_MIGRATION_PARAM_TYPE_INT, + }, }; -G_STATIC_ASSERT(G_N_ELEMENTS(qemuMigrationParamTypes) =3D=3D QEMU_MIGRATIO= N_PARAM_LAST); +G_STATIC_ASSERT(G_N_ELEMENTS(qemuMigrationParamInfo) =3D=3D QEMU_MIGRATION= _PARAM_LAST); =20 =20 virBitmap * @@ -281,7 +312,7 @@ qemuMigrationParamsFree(qemuMigrationParams *migParams) return; =20 for (i =3D 0; i < QEMU_MIGRATION_PARAM_LAST; i++) { - if (qemuMigrationParamTypes[i] =3D=3D QEMU_MIGRATION_PARAM_TYPE_ST= RING) + if (qemuMigrationParamInfo[i].type =3D=3D QEMU_MIGRATION_PARAM_TYP= E_STRING) g_free(migParams->params[i].value.s); } =20 @@ -295,7 +326,7 @@ static int qemuMigrationParamsCheckType(qemuMigrationParam param, qemuMigrationParamType type) { - if (qemuMigrationParamTypes[param] !=3D type) { + if (qemuMigrationParamInfo[param].type !=3D type) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Type mismatch for '%s' migration parameter"), qemuMigrationParamTypeToString(param)); @@ -595,7 +626,7 @@ qemuMigrationParamsFromFlags(virTypedParameterPtr param= s, VIR_DEBUG("Setting migration parameter '%s' from '%s'", qemuMigrationParamTypeToString(item->param), item->typed= Param); =20 - switch (qemuMigrationParamTypes[item->param]) { + switch (qemuMigrationParamInfo[item->param].type) { case QEMU_MIGRATION_PARAM_TYPE_INT: if (qemuMigrationParamsGetTPInt(migParams, item->param, params, nparams, item->typedParam, @@ -671,7 +702,7 @@ qemuMigrationParamsDump(qemuMigrationParams *migParams, if (!(item->party & QEMU_MIGRATION_DESTINATION)) continue; =20 - switch (qemuMigrationParamTypes[item->param]) { + switch (qemuMigrationParamInfo[item->param].type) { case QEMU_MIGRATION_PARAM_TYPE_INT: if (qemuMigrationParamsSetTPInt(migParams, item->param, params, nparams, maxparams, @@ -721,7 +752,7 @@ qemuMigrationParamsFromJSON(virJSONValue *params) name =3D qemuMigrationParamTypeToString(i); pv =3D &migParams->params[i]; =20 - switch (qemuMigrationParamTypes[i]) { + switch (qemuMigrationParamInfo[i].type) { case QEMU_MIGRATION_PARAM_TYPE_INT: if (virJSONValueObjectGetNumberInt(params, name, &pv->value.i)= =3D=3D 0) pv->set =3D true; @@ -764,7 +795,7 @@ qemuMigrationParamsToJSON(qemuMigrationParams *migParam= s) if (!pv->set) continue; =20 - switch (qemuMigrationParamTypes[i]) { + switch (qemuMigrationParamInfo[i].type) { case QEMU_MIGRATION_PARAM_TYPE_INT: rc =3D virJSONValueObjectAppendNumberInt(params, name, pv->val= ue.i); break; @@ -1280,7 +1311,7 @@ qemuMigrationParamsFormat(virBuffer *buf, virBufferAsprintf(buf, "value.i); break; @@ -1357,7 +1388,7 @@ qemuMigrationParamsParse(xmlXPathContextPtr ctxt, } =20 rc =3D 0; - switch (qemuMigrationParamTypes[param]) { + switch (qemuMigrationParamInfo[param].type) { case QEMU_MIGRATION_PARAM_TYPE_INT: rc =3D virStrToLong_i(value, NULL, 10, &pv->value.i); break; --=20 2.35.1 From nobody Tue May 14 20:37:47 2024 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=1656589556; cv=none; d=zohomail.com; s=zohoarc; b=K50mOHCcElGMZJYChGl63wKZM0pHfFpobTdz3bXho2KfUHcwPENHizaH0W69e3b4G5KB39ApkJi5kx9DBOfpR+1Y1fdJqP0RB8sZNADTVsk4b3lGTOsIDnno13f2cfy6sBlgUfKhEpwD5f/R4uTggY2XkJMLeOWoE2nb4UKMcQ4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1656589556; 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=bMvIzgUjsCmg2iRn7UHqHhVrUo5tgL+qn0B5suhHCiE=; b=EPq3q4vjI8DdsaiTx57FspfGrcgxygxg3kVjs7fhnlQgoYH7Zggx+mm5A9BE11kzbRpkCanilHyw+iMW0NnfVOPeCAOc/0wIm/PfNtLPRo9bx7Dsk/382Yeo7TSFSHVb1A1Sb8L2pZvllZ35ZfroUrTA9XC2O/VqbINTXDuysY4= 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 1656589556475209.07384778209257; Thu, 30 Jun 2022 04:45:56 -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-634-bEvBQSvWOVWQFT3AMIDMuA-1; Thu, 30 Jun 2022 07:45:51 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 238BE8339AB; 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 9D7781402403; Thu, 30 Jun 2022 11:45:45 +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 92F4B1947058; Thu, 30 Jun 2022 11:45:45 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 0019D1947060 for ; Thu, 30 Jun 2022 11:45:44 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id C56B640885A2; 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 A680440885A1 for ; Thu, 30 Jun 2022 11:45:44 +0000 (UTC) Received: by virval.usersys.redhat.com (Postfix, from userid 500) id A40512407F2; 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=1656589555; 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=bMvIzgUjsCmg2iRn7UHqHhVrUo5tgL+qn0B5suhHCiE=; b=XHJlIyLewhiyVYqX5Ob239D0B75FgQeKnJtsHB5pRV1qf6b3sr851/wwvKImV3je5UlHcz m9cdQvbIWUBxdZpeTu3osCd9gihAxIpByjWlbqJgvhtiGXtINcMaFrN9P9CXDmyp5bfUKw UUR2nISEC/AJ+NeU4U08ffkfO0gJltY= X-MC-Unique: bEvBQSvWOVWQFT3AMIDMuA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Jiri Denemark To: libvir-list@redhat.com Subject: [libvirt PATCH 3/4] qemu_migration: Pass migParams to qemuMigrationSrcResume Date: Thu, 30 Jun 2022 13:45:39 +0200 Message-Id: <508bca07bf82abd6961ec0100fc81d9f7e8862af.1656589462.git.jdenemar@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.2 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.85 on 10.11.54.7 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: 1656589556979100001 Content-Type: text/plain; charset="utf-8" So the we can apply selected migration parameters even when resuming post-copy migration. Signed-off-by: Jiri Denemark Reviewed-by: Michal Privoznik --- src/qemu/qemu_migration.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 4ca2f8b600..0c41af86e7 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -5051,6 +5051,7 @@ qemuMigrationSrcRun(virQEMUDriver *driver, =20 static int qemuMigrationSrcResume(virDomainObj *vm, + qemuMigrationParams *migParams G_GNUC_UNUSED, const char *cookiein, int cookieinlen, char **cookieout, @@ -5183,7 +5184,7 @@ qemuMigrationSrcPerformNative(virQEMUDriver *driver, spec.fwdType =3D MIGRATION_FWD_DIRECT; =20 if (flags & VIR_MIGRATE_POSTCOPY_RESUME) { - ret =3D qemuMigrationSrcResume(vm, cookiein, cookieinlen, + ret =3D qemuMigrationSrcResume(vm, migParams, cookiein, cookieinle= n, cookieout, cookieoutlen, &spec); } else { ret =3D qemuMigrationSrcRun(driver, vm, persist_xml, cookiein, coo= kieinlen, @@ -6078,6 +6079,7 @@ qemuMigrationSrcPerformResume(virQEMUDriver *driver, virConnectPtr conn, virDomainObj *vm, const char *uri, + qemuMigrationParams *migParams, const char *cookiein, int cookieinlen, char **cookieout, @@ -6102,7 +6104,7 @@ qemuMigrationSrcPerformResume(virQEMUDriver *driver, ret =3D qemuMigrationSrcPerformNative(driver, vm, NULL, uri, cookiein, cookieinlen, cookieout, cookieoutlen, flags, - 0, NULL, NULL, 0, NULL, NULL, NULL= ); + 0, NULL, NULL, 0, NULL, migParams,= NULL); =20 if (virCloseCallbacksSet(driver->closeCallbacks, vm, conn, qemuMigrationAnyConnectionClosed) < 0) @@ -6142,7 +6144,7 @@ qemuMigrationSrcPerformPhase(virQEMUDriver *driver, int ret =3D -1; =20 if (flags & VIR_MIGRATE_POSTCOPY_RESUME) { - return qemuMigrationSrcPerformResume(driver, conn, vm, uri, + return qemuMigrationSrcPerformResume(driver, conn, vm, uri, migPar= ams, cookiein, cookieinlen, cookieout, cookieoutlen, flag= s); } --=20 2.35.1 From nobody Tue May 14 20:37:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1656589557; cv=none; d=zohomail.com; s=zohoarc; b=UyvIooGF9DGQXJpnUUmim6I4PhLURP1pj+hVA3D9Y3hNQjt3DGT/An8X3ad8JV2udyrBr1CZcc+IhQBI30mvRwRcRUPYzYtAuBjTY96i+t4cHaUUI+H8rP3Kf60F+cv04+9GDWMclsJSQ2ADyuMYQa2+Vwvw5BtPPpkLoNFzkIk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1656589557; 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=S3RQ8BAzeYG7/aW33hUTsa0kpl7jKOLhbRLR15wqpYE=; b=kR3zcFv91fxM71JGNT6HOFKgtdrPIwPIsVSxF/0dLUp4LWKvjEZLBJ1h2F1XwOysMVmKTEkACWzRMCDs1Q3FizpRtxPdnV8WnZkfn34YkmBRIWeudpekeV9l152vOlGR+Rpgl9ehP+rJw7E4zINKdmLdASg7l7yRLRxdQiHvsgc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1656589557622622.8349029893117; Thu, 30 Jun 2022 04:45:57 -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-563-lIE_3O3zPAOQwpGTpYDgUA-1; Thu, 30 Jun 2022 07:45:52 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 248D98061F1; 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 CC46FC2810D; Thu, 30 Jun 2022 11:45:47 +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 D5A0B19451EF; Thu, 30 Jun 2022 11:45:45 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id F3B3E194704E for ; Thu, 30 Jun 2022 11:45:44 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id E35872026D64; 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 A921D2026D07 for ; Thu, 30 Jun 2022 11:45:44 +0000 (UTC) Received: by virval.usersys.redhat.com (Postfix, from userid 500) id A58672408F1; 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=1656589556; 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=S3RQ8BAzeYG7/aW33hUTsa0kpl7jKOLhbRLR15wqpYE=; b=buT0p7CcQl422UJFiknfd3ZWR7kQBbE8w71c6UY2GB6NR0xn8YJ83l5c/00Uy6Vu7IhWZS yjBlWkn5x7ezQhYbdyD2RXAfSQtpKx1CYy0YD093lZoH61zlEzDzhWLYSDQ60ZnhNzLtUr e69p4DP7k4POR7rs9hzbGQyaFg/lO60= X-MC-Unique: lIE_3O3zPAOQwpGTpYDgUA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Jiri Denemark To: libvir-list@redhat.com Subject: [libvirt PATCH 4/4] qemu_migration: Apply max-postcopy-bandwidth on post-copy resume Date: Thu, 30 Jun 2022 13:45:40 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 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.85 on 10.11.54.8 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: 1656589559043100007 Content-Type: text/plain; charset="utf-8" When resuming post-copy migration users may want to limit the bandwidth used by the migration and use a value that is different from the one specified when the migration was originally started. Resolves: https://gitlab.com/libvirt/libvirt/-/issues/333 Signed-off-by: Jiri Denemark Reviewed-by: Michal Privoznik --- src/qemu/qemu_migration.c | 12 ++++++-- src/qemu/qemu_migration_params.c | 45 ++++++++++++++++++---------- src/qemu/qemu_migration_paramspriv.h | 3 +- tests/qemumigparamstest.c | 2 +- tests/qemumigrationcookiexmltest.c | 2 +- 5 files changed, 42 insertions(+), 22 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 0c41af86e7..368995085f 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -5051,12 +5051,13 @@ qemuMigrationSrcRun(virQEMUDriver *driver, =20 static int qemuMigrationSrcResume(virDomainObj *vm, - qemuMigrationParams *migParams G_GNUC_UNUSED, + qemuMigrationParams *migParams, const char *cookiein, int cookieinlen, char **cookieout, int *cookieoutlen, - qemuMigrationSpec *spec) + qemuMigrationSpec *spec, + unsigned long flags) { qemuDomainObjPrivate *priv =3D vm->privateData; virQEMUDriver *driver =3D priv->driver; @@ -5073,6 +5074,10 @@ qemuMigrationSrcResume(virDomainObj *vm, if (!mig) return -1; =20 + if (qemuMigrationParamsApply(driver, vm, VIR_ASYNC_JOB_MIGRATION_OUT, + migParams, flags) < 0) + return -1; + if (qemuDomainObjEnterMonitorAsync(driver, vm, VIR_ASYNC_JOB_MIGRATION_OUT) < 0) return -1; @@ -5154,6 +5159,7 @@ qemuMigrationSrcPerformNative(virQEMUDriver *driver, =20 if (STREQ(uribits->scheme, "unix")) { if ((flags & VIR_MIGRATE_TLS) && + !(flags & VIR_MIGRATE_POSTCOPY_RESUME) && !qemuMigrationParamsTLSHostnameIsSet(migParams)) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("Explicit destination hostname is required " @@ -5185,7 +5191,7 @@ qemuMigrationSrcPerformNative(virQEMUDriver *driver, =20 if (flags & VIR_MIGRATE_POSTCOPY_RESUME) { ret =3D qemuMigrationSrcResume(vm, migParams, cookiein, cookieinle= n, - cookieout, cookieoutlen, &spec); + cookieout, cookieoutlen, &spec, flags= ); } else { ret =3D qemuMigrationSrcRun(driver, vm, persist_xml, cookiein, coo= kieinlen, cookieout, cookieoutlen, flags, resource, diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_par= ams.c index a68aed9aa4..6ea0bde13a 100644 --- a/src/qemu/qemu_migration_params.c +++ b/src/qemu/qemu_migration_params.c @@ -141,6 +141,7 @@ struct _qemuMigrationParamsTPMapItem { typedef struct _qemuMigrationParamInfoItem qemuMigrationParamInfoItem; struct _qemuMigrationParamInfoItem { qemuMigrationParamType type; + bool applyOnPostcopyResume; }; =20 /* Migration capabilities which should always be enabled as long as they @@ -265,6 +266,7 @@ static const qemuMigrationParamInfoItem qemuMigrationPa= ramInfo[] =3D { }, [QEMU_MIGRATION_PARAM_MAX_POSTCOPY_BANDWIDTH] =3D { .type =3D QEMU_MIGRATION_PARAM_TYPE_ULL, + .applyOnPostcopyResume =3D true, }, [QEMU_MIGRATION_PARAM_MULTIFD_CHANNELS] =3D { .type =3D QEMU_MIGRATION_PARAM_TYPE_INT, @@ -782,7 +784,8 @@ qemuMigrationParamsFromJSON(virJSONValue *params) =20 =20 virJSONValue * -qemuMigrationParamsToJSON(qemuMigrationParams *migParams) +qemuMigrationParamsToJSON(qemuMigrationParams *migParams, + bool postcopyResume) { g_autoptr(virJSONValue) params =3D virJSONValueNewObject(); size_t i; @@ -795,6 +798,9 @@ qemuMigrationParamsToJSON(qemuMigrationParams *migParam= s) if (!pv->set) continue; =20 + if (postcopyResume && !qemuMigrationParamInfo[i].applyOnPostcopyRe= sume) + continue; + switch (qemuMigrationParamInfo[i].type) { case QEMU_MIGRATION_PARAM_TYPE_INT: rc =3D virJSONValueObjectAppendNumberInt(params, name, pv->val= ue.i); @@ -868,6 +874,7 @@ qemuMigrationCapsToJSON(virBitmap *caps, * * 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. + * VIR_MIGRATE_POSTCOPY_RESUME is the only flag checked currently. * * Returns 0 on success, -1 on failure. */ @@ -876,32 +883,38 @@ qemuMigrationParamsApply(virQEMUDriver *driver, virDomainObj *vm, int asyncJob, qemuMigrationParams *migParams, - unsigned long apiFlags G_GNUC_UNUSED) + unsigned long apiFlags) { qemuDomainObjPrivate *priv =3D vm->privateData; bool xbzrleCacheSize_old =3D false; g_autoptr(virJSONValue) params =3D NULL; g_autoptr(virJSONValue) caps =3D NULL; qemuMigrationParam xbzrle =3D QEMU_MIGRATION_PARAM_XBZRLE_CACHE_SIZE; + bool postcopyResume =3D !!(apiFlags & VIR_MIGRATE_POSTCOPY_RESUME); int ret =3D -1; =20 if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0) return -1; =20 - if (asyncJob =3D=3D VIR_ASYNC_JOB_NONE) { - if (!virBitmapIsAllClear(migParams->caps)) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Migration capabilities can only be set by " - "a migration job")); - goto cleanup; - } - } else { - if (!(caps =3D qemuMigrationCapsToJSON(priv->migrationCaps, migPar= ams->caps))) - goto cleanup; + /* Changing capabilities is only allowed before migration starts, we n= eed + * to skip them when resuming post-copy migration. + */ + if (!postcopyResume) { + if (asyncJob =3D=3D VIR_ASYNC_JOB_NONE) { + if (!virBitmapIsAllClear(migParams->caps)) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Migration capabilities can only be set b= y " + "a migration job")); + goto cleanup; + } + } else { + if (!(caps =3D qemuMigrationCapsToJSON(priv->migrationCaps, mi= gParams->caps))) + goto cleanup; =20 - if (virJSONValueArraySize(caps) > 0 && - qemuMonitorSetMigrationCapabilities(priv->mon, &caps) < 0) - goto cleanup; + if (virJSONValueArraySize(caps) > 0 && + qemuMonitorSetMigrationCapabilities(priv->mon, &caps) < 0) + goto cleanup; + } } =20 /* If QEMU is too old to support xbzrle-cache-size migration parameter, @@ -917,7 +930,7 @@ qemuMigrationParamsApply(virQEMUDriver *driver, migParams->params[xbzrle].set =3D false; } =20 - if (!(params =3D qemuMigrationParamsToJSON(migParams))) + if (!(params =3D qemuMigrationParamsToJSON(migParams, postcopyResume))) goto cleanup; =20 if (virJSONValueObjectKeysNumber(params) > 0 && diff --git a/src/qemu/qemu_migration_paramspriv.h b/src/qemu/qemu_migration= _paramspriv.h index f7e0f51fbd..34d51231ff 100644 --- a/src/qemu/qemu_migration_paramspriv.h +++ b/src/qemu/qemu_migration_paramspriv.h @@ -26,7 +26,8 @@ #pragma once =20 virJSONValue * -qemuMigrationParamsToJSON(qemuMigrationParams *migParams); +qemuMigrationParamsToJSON(qemuMigrationParams *migParams, + bool postcopyResume); =20 qemuMigrationParams * qemuMigrationParamsFromJSON(virJSONValue *params); diff --git a/tests/qemumigparamstest.c b/tests/qemumigparamstest.c index bcdee5f32b..5d45a9dd58 100644 --- a/tests/qemumigparamstest.c +++ b/tests/qemumigparamstest.c @@ -155,7 +155,7 @@ qemuMigParamsTestJSON(const void *opaque) if (!(migParams =3D qemuMigrationParamsFromJSON(paramsIn))) return -1; =20 - if (!(paramsOut =3D qemuMigrationParamsToJSON(migParams)) || + if (!(paramsOut =3D qemuMigrationParamsToJSON(migParams, false)) || !(actualJSON =3D virJSONValueToString(paramsOut, true))) return -1; =20 diff --git a/tests/qemumigrationcookiexmltest.c b/tests/qemumigrationcookie= xmltest.c index 316bfedd15..9731348b53 100644 --- a/tests/qemumigrationcookiexmltest.c +++ b/tests/qemumigrationcookiexmltest.c @@ -333,7 +333,7 @@ testQemuMigrationCookieBlockDirtyBitmaps(const void *op= aque) =20 qemuMigrationParamsSetBlockDirtyBitmapMapping(migParams, &migParamsBit= maps); =20 - if (!(paramsOut =3D qemuMigrationParamsToJSON(migParams)) || + if (!(paramsOut =3D qemuMigrationParamsToJSON(migParams, false)) || !(actualJSON =3D virJSONValueToString(paramsOut, true))) return -1; =20 --=20 2.35.1