From nobody Mon Feb 9 06:50:18 2026 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=1657888314; cv=none; d=zohomail.com; s=zohoarc; b=VeUrDJADrWfyvcD76TEmHtKvfPd61tV0MGy7z5zIfwlP9TyTCVGimhJMzDqMrBqU94Z3j6yEWNaHV5fGmnczPYk8j3VmKC4PEZlqXfsfsiM5M7uZzhpuVe5KFnytEhMEE3H39dDUyJlRjlYPE5jPfY1Pv9llbyhsEi9WxCwsxzs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1657888314; 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=5lCZBE8LpCYYk/mbtzITEGlWXw98cZaAMOwzXFWqGWM=; b=G+NKTQxNLVGYdM8CBmAbIrNO5RMFd5StSyKUT70hUdoNgB1P8IUZxaNdtXCWZM3/yRjrcwgMzgh/tLz2sJD2m17TF042r9kTEFbocheU8BW4ou2ZnnwxHA6JFHRDnZgq/8MiNXYFzTwB2iShLpNJix49nVDvOfrwxGWsUVJ9yP4= 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 1657888314147518.544825706118; Fri, 15 Jul 2022 05:31:54 -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-495-RAlRkjhwNBuCGXom2xQnZQ-1; Fri, 15 Jul 2022 08:31:49 -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 42F71101A595; Fri, 15 Jul 2022 12:31:47 +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 2F338C1D3AD; Fri, 15 Jul 2022 12:31: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 6C1A019452D2; Fri, 15 Jul 2022 12:31:46 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 7685519466DF for ; Fri, 15 Jul 2022 12:31:45 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 5076518EAA; Fri, 15 Jul 2022 12:31:45 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id B67A918EBB for ; Fri, 15 Jul 2022 12:31:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1657888313; 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=5lCZBE8LpCYYk/mbtzITEGlWXw98cZaAMOwzXFWqGWM=; b=XPlkPXZAosPti2oVT056bbUu1sZWGUrz8W6ZLxiyELkp8XCQE5ci+cp/mWBH9fNGCEseSl r7qSe1PDkGhfikNQxVu4E1dz66KEup5iq61xoYYvLskTc8cinQU/NQ7lnmXfVlBpqjHBHm XAPxGg0JN1u2JMgTnBcrnBz+g+VcyoI= X-MC-Unique: RAlRkjhwNBuCGXom2xQnZQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 1/7] qemu: Always assume support for QEMU_CAPS_MIGRATION_PARAM_BANDWIDTH Date: Fri, 15 Jul 2022 14:31:36 +0200 Message-Id: <7512fc37a06666da2e4c5f59b90f85820491bf8f.1657888221.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 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: 1657888314887100001 Content-Type: text/plain; charset="utf-8" The 'max-bandwidth' field was added as argument of 'migrate-set-parameters' in qemu-2.8, thus all qemu version supported by libvirt already use the new code path. This patch assumes the presence and removes the legacy code paths. Signed-off-by: Peter Krempa --- src/qemu/qemu_driver.c | 39 ++++++++++------------------ src/qemu/qemu_migration.c | 53 +++++++++++---------------------------- 2 files changed, 28 insertions(+), 64 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index da95f947e7..a632945146 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -13304,7 +13304,7 @@ qemuDomainMigrateSetMaxSpeed(virDomainPtr dom, qemuDomainObjPrivate *priv; bool postcopy =3D !!(flags & VIR_DOMAIN_MIGRATE_MAX_SPEED_POSTCOPY); g_autoptr(qemuMigrationParams) migParams =3D NULL; - bool bwParam; + qemuMigrationParam param; unsigned long long max; int ret =3D -1; @@ -13343,35 +13343,22 @@ qemuDomainMigrateSetMaxSpeed(virDomainPtr dom, VIR_DEBUG("Setting migration bandwidth to %luMbs", bandwidth); - bwParam =3D virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATION_PARAM_B= ANDWIDTH); - if (postcopy || bwParam) { - qemuMigrationParam param; - - if (!(migParams =3D qemuMigrationParamsNew())) - goto endjob; - - if (postcopy) - param =3D QEMU_MIGRATION_PARAM_MAX_POSTCOPY_BANDWIDTH; - else - param =3D QEMU_MIGRATION_PARAM_MAX_BANDWIDTH; + if (!(migParams =3D qemuMigrationParamsNew())) + goto endjob; - if (qemuMigrationParamsSetULL(migParams, param, - bandwidth * 1024 * 1024) < 0) - goto endjob; + if (postcopy) + param =3D QEMU_MIGRATION_PARAM_MAX_POSTCOPY_BANDWIDTH; + else + param =3D QEMU_MIGRATION_PARAM_MAX_BANDWIDTH; - if (qemuMigrationParamsApply(driver, vm, VIR_ASYNC_JOB_NONE, - migParams, 0) < 0) - goto endjob; - } else { - int rc; + if (qemuMigrationParamsSetULL(migParams, param, + bandwidth * 1024 * 1024) < 0) + goto endjob; - qemuDomainObjEnterMonitor(driver, vm); - rc =3D qemuMonitorSetMigrationSpeed(priv->mon, bandwidth); - qemuDomainObjExitMonitor(vm); - if (rc < 0) - goto endjob; - } + if (qemuMigrationParamsApply(driver, vm, VIR_ASYNC_JOB_NONE, + migParams, 0) < 0) + goto endjob; if (!postcopy) priv->migMaxBandwidth =3D bandwidth; diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 9c3fd41761..b12cb518ee 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -4697,7 +4697,6 @@ qemuMigrationSrcRun(virQEMUDriver *driver, virErrorPtr orig_err =3D NULL; unsigned int cookieFlags =3D 0; bool abort_on_error =3D !!(flags & VIR_MIGRATE_ABORT_ON_ERROR); - bool bwParam =3D virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATION_PA= RAM_BANDWIDTH); bool storageMigration =3D flags & (VIR_MIGRATE_NON_SHARED_DISK | VIR_M= IGRATE_NON_SHARED_INC); bool cancel =3D false; unsigned int waitFlags; @@ -4795,8 +4794,7 @@ qemuMigrationSrcRun(virQEMUDriver *driver, goto error; } - if (bwParam && - qemuMigrationParamsSetULL(migParams, QEMU_MIGRATION_PARAM_MAX_BAND= WIDTH, + if (qemuMigrationParamsSetULL(migParams, QEMU_MIGRATION_PARAM_MAX_BAND= WIDTH, priv->migMaxBandwidth * 1024 * 1024) < 0) goto error; @@ -4887,10 +4885,6 @@ qemuMigrationSrcRun(virQEMUDriver *driver, goto exit_monitor; } - if (!bwParam && - qemuMonitorSetMigrationSpeed(priv->mon, priv->migMaxBandwidth) < 0) - goto exit_monitor; - rc =3D qemuMigrationSrcStart(vm, spec, migrate_flags, &fd); qemuDomainObjExitMonitor(vm); @@ -6880,7 +6874,6 @@ qemuMigrationSrcToFile(virQEMUDriver *driver, virDoma= inObj *vm, virDomainAsyncJob asyncJob) { qemuDomainObjPrivate *priv =3D vm->privateData; - bool bwParam =3D virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATION_PA= RAM_BANDWIDTH); int rc; int ret =3D -1; int pipeFD[2] =3D { -1, -1 }; @@ -6894,27 +6887,18 @@ qemuMigrationSrcToFile(virQEMUDriver *driver, virDo= mainObj *vm, /* Increase migration bandwidth to unlimited since target is a file. * Failure to change migration speed is not fatal. */ - if (bwParam) { - if (!(migParams =3D qemuMigrationParamsNew())) - return -1; + if (!(migParams =3D qemuMigrationParamsNew())) + return -1; - if (qemuMigrationParamsSetULL(migParams, - QEMU_MIGRATION_PARAM_MAX_BANDWIDTH, - QEMU_DOMAIN_MIG_BANDWIDTH_MAX * 1024= * 1024) < 0) - return -1; + if (qemuMigrationParamsSetULL(migParams, + QEMU_MIGRATION_PARAM_MAX_BANDWIDTH, + QEMU_DOMAIN_MIG_BANDWIDTH_MAX * 1024 * 1= 024) < 0) + return -1; - if (qemuMigrationParamsApply(driver, vm, asyncJob, migParams, 0) <= 0) - return -1; + if (qemuMigrationParamsApply(driver, vm, asyncJob, migParams, 0) < 0) + return -1; - priv->migMaxBandwidth =3D QEMU_DOMAIN_MIG_BANDWIDTH_MAX; - } else { - if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) =3D=3D 0)= { - qemuMonitorSetMigrationSpeed(priv->mon, - QEMU_DOMAIN_MIG_BANDWIDTH_MAX); - priv->migMaxBandwidth =3D QEMU_DOMAIN_MIG_BANDWIDTH_MAX; - qemuDomainObjExitMonitor(vm); - } - } + priv->migMaxBandwidth =3D QEMU_DOMAIN_MIG_BANDWIDTH_MAX; if (!virDomainObjIsActive(vm)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -6994,18 +6978,11 @@ qemuMigrationSrcToFile(virQEMUDriver *driver, virDo= mainObj *vm, /* Restore max migration bandwidth */ if (virDomainObjIsActive(vm)) { - if (bwParam) { - if (qemuMigrationParamsSetULL(migParams, - QEMU_MIGRATION_PARAM_MAX_BANDWID= TH, - saveMigBandwidth * 1024 * 1024) = =3D=3D 0) - ignore_value(qemuMigrationParamsApply(driver, vm, asyncJob, - migParams, 0)); - } else { - if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) =3D= =3D 0) { - qemuMonitorSetMigrationSpeed(priv->mon, saveMigBandwidth); - qemuDomainObjExitMonitor(vm); - } - } + if (qemuMigrationParamsSetULL(migParams, + QEMU_MIGRATION_PARAM_MAX_BANDWIDTH, + saveMigBandwidth * 1024 * 1024) =3D= =3D 0) + ignore_value(qemuMigrationParamsApply(driver, vm, asyncJob, + migParams, 0)); priv->migMaxBandwidth =3D saveMigBandwidth; } --=20 2.36.1