From nobody Tue Sep 9 13:55:53 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1756306133; cv=none; d=zohomail.com; s=zohoarc; b=Mr4yR32gqX/a5dYtxJ53zKvDWfCNgteZtkePQ0h2Vi41eALK89Adsdp9yWevSPQqRQSou0NUBgRLecvXWjBONgeEXp90EhGMCDofQ2RZOztSowSvsZBUaUJEGt9rTeiOSB6AynK6WR9sF5I/XI0t5ZZ2FPMrRko4M9T/NPAxkXQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756306133; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=EjwIbhL8t139lawqE3D1oYDwY3MQvCveVyoKRM52/eE=; b=DVGnpmjtYl6UhXE940n7yftwLDOVhpOHasseCNB3btLYX+BfiHwJchwCitEXWIt7F4WKmTQA90ZaK3BkB4dAy7f7T+q8A8fSOh49PjCu9FtSDCEeKo8RNpB4HosnKfAVqSjZ5UWGjL9dCrbDuAmHUneMIEPbJsUTap2Nn4ePH3Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1756306133008602.7335495450226; Wed, 27 Aug 2025 07:48:53 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 85A65441FB; Wed, 27 Aug 2025 10:48:52 -0400 (EDT) Received: from [172.19.199.3] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id A2AA3440D3; Wed, 27 Aug 2025 10:47:42 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 7540843E80; Wed, 27 Aug 2025 10:47:24 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id D52204407E for ; Wed, 27 Aug 2025 10:46:59 -0400 (EDT) Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-658-EHujaZSxOKa2lZ4Rp-RHRw-1; Wed, 27 Aug 2025 10:46:58 -0400 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 636321955F42 for ; Wed, 27 Aug 2025 14:46:57 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.44.22.3]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 9E54130001A6 for ; Wed, 27 Aug 2025 14:46:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1756306019; h=from:from: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; bh=EjwIbhL8t139lawqE3D1oYDwY3MQvCveVyoKRM52/eE=; b=AE0iEocbB3HlBfDzP+Tp4AaN6s1EerTaHRhZiUbh0kcjU45WzgyqDTITt3RhaN/Ypikeua 6WHBlXhYMc/L1LblHfBvlQISxGkR38+bBvRkM48IO7pHGHLTrha/sQh3kV0zddW+IVxGqW qKktKk3N3HW76GAGpldoBl1erhRFTDs= X-MC-Unique: EHujaZSxOKa2lZ4Rp-RHRw-1 X-Mimecast-MFC-AGG-ID: EHujaZSxOKa2lZ4Rp-RHRw_1756306017 To: devel@lists.libvirt.org Subject: [PATCH 01/10] qemu: Always assume support for QEMU_CAPS_MIGRATE_RDMA Date: Wed, 27 Aug 2025 16:46:44 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: QEajaMdamE2XYAYC4nLWXsKQ93JFfCmVNX4Fa6MIv-E_1756306017 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: U4PHLQFEUKHOXZ3B6ERKHG5K3J4ZTBN2 X-Message-ID-Hash: U4PHLQFEUKHOXZ3B6ERKHG5K3J4ZTBN2 X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1756306134571124100 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Libvirt detects QEMU_CAPS_MIGRATE_RDMA by probing 'query-migrate-capabilities' for the presence of 'rdma-pin-all'. In qemu the entry in 'query-migrate-capabilities' existed since the introduction of the command in qemu-2.0. We thus always detect this capability. Signed-off-by: Peter Krempa --- src/qemu/qemu_migration.c | 26 +++++++------------------- src/qemu/qemu_migration.h | 3 +-- src/qemu/qemu_process.c | 2 +- 3 files changed, 9 insertions(+), 22 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index b22248e3b9..a8f4dd489c 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2387,20 +2387,14 @@ qemuMigrationDstOPDRelocate(virQEMUDriver *driver G= _GNUC_UNUSED, int -qemuMigrationDstCheckProtocol(virQEMUCaps *qemuCaps, - const char *migrateFrom) +qemuMigrationDstCheckProtocol(const char *migrateFrom) { - if (STRPREFIX(migrateFrom, "rdma")) { - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_MIGRATE_RDMA)) { - virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", - _("incoming RDMA migration is not supported wit= h this QEMU binary")); - return -1; - } - } else if (!STRPREFIX(migrateFrom, "tcp") && - !STRPREFIX(migrateFrom, "exec") && - !STRPREFIX(migrateFrom, "fd") && - !STRPREFIX(migrateFrom, "unix") && - STRNEQ(migrateFrom, "stdio")) { + if (!STRPREFIX(migrateFrom, "tcp") && + !STRPREFIX(migrateFrom, "exec") && + !STRPREFIX(migrateFrom, "fd") && + !STRPREFIX(migrateFrom, "unix") && + !STRPREFIX(migrateFrom, "rdma") && + STRNEQ(migrateFrom, "stdio")) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("unknown migration protocol")); return -1; @@ -5330,7 +5324,6 @@ qemuMigrationSrcPerformNative(virQEMUDriver *driver, qemuMigrationParams *migParams, const char *nbdURI) { - qemuDomainObjPrivate *priv =3D vm->privateData; g_autoptr(virURI) uribits =3D NULL; int ret =3D -1; qemuMigrationSpec spec; @@ -5353,11 +5346,6 @@ qemuMigrationSrcPerformNative(virQEMUDriver *driver, } if (STREQ(uribits->scheme, "rdma")) { - if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATE_RDMA)) { - virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", - _("outgoing RDMA migration is not supported wit= h this QEMU binary")); - return -1; - } if (!virMemoryLimitIsSet(vm->def->mem.hard_limit)) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("cannot start RDMA migration with no memory h= ard limit set")); diff --git a/src/qemu/qemu_migration.h b/src/qemu/qemu_migration.h index beb888160a..36865040df 100644 --- a/src/qemu/qemu_migration.h +++ b/src/qemu/qemu_migration.h @@ -274,8 +274,7 @@ qemuMigrationDstErrorReport(virQEMUDriver *driver, const char *name); int -qemuMigrationDstCheckProtocol(virQEMUCaps *qemuCaps, - const char *migrateFrom); +qemuMigrationDstCheckProtocol(const char *migrateFrom); char * qemuMigrationDstGetURI(const char *migrateFrom, diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index a81c02c9d5..059834648d 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4997,7 +4997,7 @@ qemuProcessIncomingDefNew(virQEMUDriver *driver, qemuDomainObjPrivate *priv =3D vm->privateData; qemuProcessIncomingDef *inc =3D NULL; - if (qemuMigrationDstCheckProtocol(priv->qemuCaps, migrateFrom) < 0) + if (qemuMigrationDstCheckProtocol(migrateFrom) < 0) return NULL; inc =3D g_new0(qemuProcessIncomingDef, 1); --=20 2.51.0