From nobody Fri Nov 21 10:11:02 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=1762173258; cv=none; d=zohomail.com; s=zohoarc; b=nyVnbPHpoWzGT1xoniC4nn0GJ4hwI6LyNPIoe4aiwuk+5NWT+fROF9Q2JAer0xN7zhy4QCcQqMvaj1BoMI+C3ZSGMCEZnTKr2EdULIuI2WrsDvckfnU9a8qQnL/geT0Zl31ea3gnYDx/ZWeEdKKBZrfmRBxyfuyQ5eFlZzMJJH8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1762173258; 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=m0GNxLC8SUfQei3dLXsiUKvlD5gBvdESWgtjTD1XhAU=; b=hi7idZLIONQSpkCaP3J3DIMctePbQi20Xk4e/98Q5vyKpMmHdGXwBKCjiBbHkQQcFP/UxxULjYQ1aqetF1C1tTthFQoVLFoFF7deDoBesZvdKraOKCPuHbzKQEflzFwRXMEbbPLsLZYbu54/87peUg982hfYI+r3KIrgFtaoOHs= 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 1762173258014979.307833147954; Mon, 3 Nov 2025 04:34:18 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 5115A41A66; Mon, 3 Nov 2025 07:34:17 -0500 (EST) Received: from [172.19.199.29] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 6F56A4401A; Mon, 3 Nov 2025 07:29:29 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id E5A8943F3D; Mon, 3 Nov 2025 07:29:11 -0500 (EST) 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 36F6343F44 for ; Mon, 3 Nov 2025 07:29:11 -0500 (EST) Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-388-LK4rONZFM8WI5egAwKYLCQ-1; Mon, 03 Nov 2025 07:29:09 -0500 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id EA5451801366 for ; Mon, 3 Nov 2025 12:29:08 +0000 (UTC) Received: from speedmetal.openshiftapps.com (unknown [10.44.22.2]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 2BB6D19560BC for ; Mon, 3 Nov 2025 12:29:07 +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=-5.0 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, 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=1762172950; 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=m0GNxLC8SUfQei3dLXsiUKvlD5gBvdESWgtjTD1XhAU=; b=KVxSBJlRE16K95IBPtKbVaugfErXuN74C23d0IvXSV8fKLnEyTp8pQ0WJW5L6rhsVcZVv8 vFvLJsUTg53weLqDRKW3qTUu/ooHjTKGqynYxs28pnSpotQ6mFZPM9dHPmujguRNNlOxFU Wap2Y56CZryP28D2pYYADysbWrxR5H4= X-MC-Unique: LK4rONZFM8WI5egAwKYLCQ-1 X-Mimecast-MFC-AGG-ID: LK4rONZFM8WI5egAwKYLCQ_1762172949 To: devel@lists.libvirt.org Subject: [PATCH 2/3] qemu: capabilities: Fix logic for formatting 'reconnect' parameter Date: Mon, 3 Nov 2025 13:29:03 +0100 Message-ID: <5a434bc19583864076d823311bd0a7c6d4c32dcc.1762172839.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: jT8Ru9c0TqA6dp6OsO1mEwwFK1MvsxYQsm47uRfAfqg_1762172949 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: JF55PPMGPK6R3GY7UOTL3DGZQ747XSMU X-Message-ID-Hash: JF55PPMGPK6R3GY7UOTL3DGZQ747XSMU 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: 1762173262613154100 Content-Type: text/plain; charset="utf-8" From: Peter Krempa In commit e4d058866e9 I've converted the code to use the modern 'reconnect-ms' parameter instead of 'reconnect' but messed up the logic for the time when 'reconnect' will be removed. We need to check QEMU_CAPS_NETDEV_STREAM_RECONNECT_MILISECONDS individually and not based on QEMU_CAPS_NETDEV_STREAM_RECONNECT. Fix the logic as upstream qemu now removed 'reconnect'. Fixes: e4d058866e9563756349de6b3f451a53e64ca872 Signed-off-by: Peter Krempa --- src/qemu/qemu_passt.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_passt.c b/src/qemu/qemu_passt.c index fcec2ed76b..520eb1244a 100644 --- a/src/qemu/qemu_passt.c +++ b/src/qemu/qemu_passt.c @@ -104,17 +104,15 @@ qemuPasstAddNetProps(virDomainObj *vm, return -1; } - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_NETDEV_STREAM_RECONNECT)) { - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_NETDEV_STREAM_RECONNECT_MIL= ISECONDS)) { - if (virJSONValueObjectAdd(netprops, "u:reconnect-ms", - QEMU_PASST_RECONNECT_TIMEOUT * 1000,= NULL) < 0) { - return -1; - } - } else { - if (virJSONValueObjectAdd(netprops, "u:reconnect", - QEMU_PASST_RECONNECT_TIMEOUT, NULL) = < 0) { - return -1; - } + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_NETDEV_STREAM_RECONNECT_MILISEC= ONDS)) { + if (virJSONValueObjectAdd(netprops, "u:reconnect-ms", + QEMU_PASST_RECONNECT_TIMEOUT * 1000, NUL= L) < 0) { + return -1; + } + } else if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_NETDEV_STREAM_RECONNECT)= ) { + if (virJSONValueObjectAdd(netprops, "u:reconnect", + QEMU_PASST_RECONNECT_TIMEOUT, NULL) < 0)= { + return -1; } } --=20 2.51.0