From nobody Wed Dec 4 09:05:42 2024 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1732015721432665.5971459772442; Tue, 19 Nov 2024 03:28:41 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 507C114BE; Tue, 19 Nov 2024 06:28:40 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 42C9D1AEA; Tue, 19 Nov 2024 06:27:28 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 689B61B57; Tue, 19 Nov 2024 06:27:23 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 6E6501B57 for ; Tue, 19 Nov 2024 06:27:15 -0500 (EST) Received: from mx-prod-mc-02.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-115-oEwkjzUKPKWniqUEVk_0tw-1; Tue, 19 Nov 2024 06:27:13 -0500 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 31CAF1955EE9 for ; Tue, 19 Nov 2024 11:27:13 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.6]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 344FF1956054 for ; Tue, 19 Nov 2024 11:27:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.5 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1732015635; 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=e/H9PxYLFwPPF9ZErvIvVNTFOojMWCElZ6Oe5lBsyi4=; b=XqAqs+5CIVuTEWq5grg5kFKsKvBKaatUftHTm2IbXZ35m6LM81tXUoQ307ywHblscG0wjk 4uCeZZcQGFs7hnAAnyqZD+jKTYzwqp+5z+mKkwOeu85acdFncdsl2pBuTt5aQq1bOYU+Rg s9v0oLp3YkvhpKvoVNvbJjLWQ3kPagc= X-MC-Unique: oEwkjzUKPKWniqUEVk_0tw-1 X-Mimecast-MFC-AGG-ID: oEwkjzUKPKWniqUEVk_0tw From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 3/4] qemu: passt: Use 'reconnect-ms' instead of 'reconnect' with new qemus Date: Tue, 19 Nov 2024 12:27:04 +0100 Message-ID: <09f74b25854c539fa1b9f37e84d055a9c4aac976.1732015586.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: w2gPQgw3cTz4S9twAaOB4MnH3gPsfUnDdEJuiDTl9-Q_1732015633 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: RQKQCCP5WDMZGDEKXYOO423WTBJRMWAM X-Message-ID-Hash: RQKQCCP5WDMZGDEKXYOO423WTBJRMWAM X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1732015723347116600 Content-Type: text/plain; charset="utf-8" The 'reconnect' field of 'stream' network backend type is about to be deprecated so libvirt will need to start using 'reconnect-ms'. Signed-off-by: Peter Krempa --- src/qemu/qemu_passt.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_passt.c b/src/qemu/qemu_passt.c index 70a12c825e..dd4a8bb997 100644 --- a/src/qemu/qemu_passt.c +++ b/src/qemu/qemu_passt.c @@ -104,12 +104,14 @@ qemuPasstAddNetProps(virDomainObj *vm, return -1; } - /* a narrow range of QEMU releases support -netdev stream, but - * don't support its "reconnect" option - */ - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_NETDEV_STREAM_RECONNECT) && - virJSONValueObjectAdd(netprops, "u:reconnect", 5, NULL) < 0) { - 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", 5000, NU= LL) < 0) + return -1; + } else { + if (virJSONValueObjectAdd(netprops, "u:reconnect", 5, NULL) < = 0) + return -1; + } } return 0; --=20 2.47.0