From nobody Wed Aug 26 02:46:15 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1779362911; cv=none; d=zohomail.com; s=zohoarc; b=LvXCgg8aFf8BgLt3mBS0wo+q6frViUNQAnZ6k401NEo91SpTJApJXcA5AxdbL0Fmo87LT0V2veCo8PA8lBx94nlURMYoY2q630q1PbZg+gxOCjFRagFGEwkPhYWM/lm8KVg+rChrA1ETTfCq+2PZTZ+L3FDESPIAAhrdk2sAYUQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779362911; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=m98GjvT/Z7zZ58Xc8+906sXBSWVFQOOMfArpR13T7Lk=; b=fpQ1ltJ19PmB7jsZQnJdakDCn/5ivIhV/uF6WVawlrhhdyDg9smv1qm0GNF5QmibPOXJJ7voQawVjsZmRQqNWg5tRojnTsuy02hja04rDRh3xqqFXwFtl09zesoHuBMi9cltuCDzbIc1w9+w6fa3bhT5HraJplw13UPjRBAYtwI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 17793629115531007.8837613675129; Thu, 21 May 2026 04:28:31 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wQ1Z6-0004bH-DP; Thu, 21 May 2026 07:27:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wQ1Yz-0004Vq-8Y for qemu-devel@nongnu.org; Thu, 21 May 2026 07:27:43 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wQ1Yx-0003UX-Nn for qemu-devel@nongnu.org; Thu, 21 May 2026 07:27:40 -0400 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-606-yeEzSV9MPR-iWRhjLtgpFw-1; Thu, 21 May 2026 07:27:33 -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 306C0195609D for ; Thu, 21 May 2026 11:27:32 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.44.22.2]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E06EF3002D2D for ; Thu, 21 May 2026 11:27:31 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 5238A21E6A03; Thu, 21 May 2026 13:27:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779362858; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=m98GjvT/Z7zZ58Xc8+906sXBSWVFQOOMfArpR13T7Lk=; b=UcQK5bVPRDfqqUIC60vATI5z2GbnQIpLpJAHw0wuf3IdZQRAIdtxY380yIfHvNjrKmMinI pMQVr19z3sn1hf5BvpYZ39Zz7Kabcm8RUmDeQ2EfHzwTJYePVDgJuy2wuzh3CMaMQW0LII 9RPBkbjwoeBLC9do1iNoTpXeccqBGTU= X-MC-Unique: yeEzSV9MPR-iWRhjLtgpFw-1 X-Mimecast-MFC-AGG-ID: yeEzSV9MPR-iWRhjLtgpFw_1779362852 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PULL 2/4] qapi/net: Wean passt off QAPI type String to improve documentation Date: Thu, 21 May 2026 13:27:27 +0200 Message-ID: <20260521112729.1287282-3-armbru@redhat.com> In-Reply-To: <20260521112729.1287282-1-armbru@redhat.com> References: <20260521112729.1287282-1-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1779362913569158500 String's doc comment is useless. Replace its use in NetDevPasstOptions by identical types with hopefully useful documentation. Signed-off-by: Markus Armbruster Message-ID: <20260506105421.2461117-3-armbru@redhat.com> Reviewed-by: Marc-Andr=C3=A9 Lureau [One Since: fixed up] --- qapi/net.json | 43 +++++++++++++++++++++++++++++++++++++++---- net/passt.c | 8 ++++---- 2 files changed, 43 insertions(+), 8 deletions(-) diff --git a/qapi/net.json b/qapi/net.json index 8ed51b665c..c95aa909a0 100644 --- a/qapi/net.json +++ b/qapi/net.json @@ -114,6 +114,41 @@ 'data': { 'str': 'str' } } =20 +## +# @PasstSearch: +# +# @str: DNS domain name suffix for host name lookup, or "none". See +# passt(1) option --search. +# +# Since: 10.1 +## +{ 'struct': 'PasstSearch', + 'data': { + 'str': 'str' } } + +## +# @PasstPortForward: +# +# @str: passt port forwarding specification, see passt(1) option +# --tcp-ports and --udp-ports. +# +# Since: 10.1 +## +{ 'struct': 'PasstPortForward', + 'data': { + 'str': 'str' } } + +## +# @PasstParameter: +# +# @str: Additional arguments for the passt executable, see passt(1) +# +# Since: 10.1 +## +{ 'struct': 'PasstParameter', + 'data': { + 'str': 'str' } } + ## # @NetdevPasstOptions: # @@ -206,7 +241,7 @@ '*outbound-if4': 'str', '*outbound-if6': 'str', '*dns': 'str', - '*search': ['String'], + '*search': ['PasstSearch'], '*fqdn': 'str', '*dhcp-dns': 'bool', '*dhcp-search': 'bool', @@ -224,9 +259,9 @@ '*freebind': 'bool', '*ipv4': 'bool', '*ipv6': 'bool', - '*tcp-ports': ['String'], - '*udp-ports': ['String'], - '*param': ['String'] }, + '*tcp-ports': ['PasstPortForward'], + '*udp-ports': ['PasstPortForward'], + '*param': ['PasstParameter'] }, 'if': 'CONFIG_PASST' } =20 ## diff --git a/net/passt.c b/net/passt.c index 223ccd1a1c..45440c399b 100644 --- a/net/passt.c +++ b/net/passt.c @@ -637,7 +637,7 @@ static GPtrArray *net_passt_decode_args(const NetdevPas= stOptions *passt, } =20 if (passt->has_search && passt->search) { - const StringList *list =3D passt->search; + const PasstSearchList *list =3D passt->search; GString *domains =3D g_string_new(list->value->str); =20 list =3D list->next; @@ -652,7 +652,7 @@ static GPtrArray *net_passt_decode_args(const NetdevPas= stOptions *passt, } =20 if (passt->has_tcp_ports && passt->tcp_ports) { - const StringList *list =3D passt->tcp_ports; + const PasstPortForwardList *list =3D passt->tcp_ports; GString *tcp_ports =3D g_string_new(list->value->str); =20 list =3D list->next; @@ -667,7 +667,7 @@ static GPtrArray *net_passt_decode_args(const NetdevPas= stOptions *passt, } =20 if (passt->has_udp_ports && passt->udp_ports) { - const StringList *list =3D passt->udp_ports; + const PasstPortForwardList *list =3D passt->udp_ports; GString *udp_ports =3D g_string_new(list->value->str); =20 list =3D list->next; @@ -682,7 +682,7 @@ static GPtrArray *net_passt_decode_args(const NetdevPas= stOptions *passt, } =20 if (passt->has_param && passt->param) { - const StringList *list =3D passt->param; + const PasstParameterList *list =3D passt->param; =20 while (list) { g_ptr_array_add(args, g_strdup(list->value->str)); --=20 2.54.0