From nobody Sat May 30 17:44:05 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=1779362897; cv=none; d=zohomail.com; s=zohoarc; b=ZR7+LFimeJgyworlKwdBKRpBjxWgeQglYtX0v/DQBa/KbLs+I5DNhkiF+yau7e/1T9kO6BQSQwTnmneYbjB/9Lzmv+tiAOZ4EkSWE7MNahKYuA2XIQvfSRZ+ZZmjAlW+IW05BnHitbz1En3XoGcowVmfXamd5lk/evgBUAdO4Ho= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779362897; 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=XtP/hXhv5FywDODea2xMa2tcAw1lOc5fEXgWxyXWOMw=; b=hz+AvojZiOz4CctIr7Xht6a6zVNCNn9/TEI+kkdXT3ngFmdqt6dsZHPQjTg+BQvE1v2rGgEEiQhWTXRC93HRZoM9aDB9ASPKCOz7urP3U0WUgncUk90Hv53zfJjB0aeLQJsXLlDvTybaYBY7fzJBb1iYL1iYPB1SZPhbfVegDvU= 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 1779362897863361.3606093759888; Thu, 21 May 2026 04:28:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wQ1Z4-0004a9-Gs; Thu, 21 May 2026 07:27:46 -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 1wQ1Yx-0004Vg-7U for qemu-devel@nongnu.org; Thu, 21 May 2026 07:27:43 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wQ1Yu-0003Tx-HD for qemu-devel@nongnu.org; Thu, 21 May 2026 07:27:38 -0400 Received: from mx-prod-mc-01.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-151-5MchhKS5MxyM0KcNMY3t_g-1; Thu, 21 May 2026 07:27:32 -0400 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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 2CF7819560A2 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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id DC47E19560A3 for ; Thu, 21 May 2026 11:27:31 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 4969721E6A02; 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=1779362854; 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=XtP/hXhv5FywDODea2xMa2tcAw1lOc5fEXgWxyXWOMw=; b=QdMAUYZBaBXELLcvZ+NWgp70js0Gv+OKM1+xT2gi7S7Q/I3y0o3t7sbGvAFk1SoUeXW7J7 HX9Oiv97P25z8pVxvMnkN+hnhV4E0gl98HLTcjWvFJpuRw1BD6zNln85M1/hUIiRpb35Zn kVHXzrDl+AAj5of5b6pxYkF4iQVhfx8= X-MC-Unique: 5MchhKS5MxyM0KcNMY3t_g-1 X-Mimecast-MFC-AGG-ID: 5MchhKS5MxyM0KcNMY3t_g_1779362852 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PULL 1/4] qapi/net: Rename NetDevPasstOptions to NetdevPasstOptions Date: Thu, 21 May 2026 13:27:26 +0200 Message-ID: <20260521112729.1287282-2-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.0 on 10.30.177.12 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.129.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_H4=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: 1779362900383154100 We have eighteen QAPI type names starting with Netdev. Commit 854ee02b222 (net: Add passt network backend) added a first one starting with NetDev. Rename it for consistency. Signed-off-by: Markus Armbruster Message-ID: <20260506105421.2461117-2-armbru@redhat.com> Reviewed-by: Marc-Andr=C3=A9 Lureau --- qapi/net.json | 6 +++--- net/passt.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qapi/net.json b/qapi/net.json index 118bd34965..8ed51b665c 100644 --- a/qapi/net.json +++ b/qapi/net.json @@ -115,7 +115,7 @@ 'str': 'str' } } =20 ## -# @NetDevPasstOptions: +# @NetdevPasstOptions: # # Unprivileged user-mode network connectivity using passt # @@ -191,7 +191,7 @@ # # Since: 10.1 ## -{ 'struct': 'NetDevPasstOptions', +{ 'struct': 'NetdevPasstOptions', 'data': { '*path': 'str', '*quiet': 'bool', @@ -877,7 +877,7 @@ 'discriminator': 'type', 'data': { 'nic': 'NetLegacyNicOptions', - 'passt': { 'type': 'NetDevPasstOptions', + 'passt': { 'type': 'NetdevPasstOptions', 'if': 'CONFIG_PASST' }, 'user': 'NetdevUserOptions', 'tap': 'NetdevTapOptions', diff --git a/net/passt.c b/net/passt.c index d3b5ab426c..223ccd1a1c 100644 --- a/net/passt.c +++ b/net/passt.c @@ -495,7 +495,7 @@ static int net_passt_vhost_user_init(NetPasstState *s, = Error **errp) } #endif =20 -static GPtrArray *net_passt_decode_args(const NetDevPasstOptions *passt, +static GPtrArray *net_passt_decode_args(const NetdevPasstOptions *passt, gchar *pidfile, Error **errp) { GPtrArray *args =3D g_ptr_array_new_with_free_func(g_free); --=20 2.54.0 From nobody Sat May 30 17:44:05 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 From nobody Sat May 30 17:44:05 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=1779362898; cv=none; d=zohomail.com; s=zohoarc; b=FVlaAl15qHKjAwm/p2VvIdhn1vN99CQ7Kp/T2GkpJS1qjfhKQn9R7Vl6mjB2rSbkrN/3PtvFNN2u9zY6aqgbWo/uInZ4DYN0JozZZv/o4vwLXp8VCVWrjtKQ5FA7mgZpq6tb7B1STi6PdOxIEuIojGbwaUA56S4zNM+HNwJIZP0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779362898; 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=r2WfgrLiG7VtM+hLnFhrn75FvMae6pQT1IGgTEksB6g=; b=cwdFYQ+jlaPv5HTbzF3kQQQsZ/fV9suiqtU67bwUgd8xKog2kZrNjjUXlEa86w7g3+AfY3+iI52EnmwYFtdoThQMKAWirziFPrX/zOjpu+sk6czdJuraKkd/XZvBDB5faUU8SlU+qSb69bRDqRROMmbfOBqQvgEQ7jfnUDnZo/I= 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 177936289806521.864656111029262; Thu, 21 May 2026 04:28:18 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wQ1Z6-0004bc-LM; 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 1wQ1Yw-0004Ve-EA for qemu-devel@nongnu.org; Thu, 21 May 2026 07:27:39 -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 1wQ1Yu-0003U0-Ea for qemu-devel@nongnu.org; Thu, 21 May 2026 07:27:38 -0400 Received: from mx-prod-mc-03.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-516-4E76kW9bMAeZT9KG_qb8-A-1; Thu, 21 May 2026 07:27:33 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 6642719560BB 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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id CDE3419560AB for ; Thu, 21 May 2026 11:27:31 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 5B08321E6A05; 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=1779362854; 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=r2WfgrLiG7VtM+hLnFhrn75FvMae6pQT1IGgTEksB6g=; b=im8n0c8xzIm51Kpu2hzIgdlpHbUsnCUeqtMreGpFLmc9wQ2tQ4XSIQ+lPJj6MULREyn3+8 HqfilWsIMbsuBWfc3Zbvnu/CgGweO6B8+3pofa6g6x382lpttffa5xajBp1F9/jxDowQna imGsYmhfH7Xmim9Y4kX+En13hK6h1wc= X-MC-Unique: 4E76kW9bMAeZT9KG_qb8-A-1 X-Mimecast-MFC-AGG-ID: 4E76kW9bMAeZT9KG_qb8-A_1779362852 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PULL 3/4] qapi/net: Wean SLIRP off QAPI type String to improve documentation Date: Thu, 21 May 2026 13:27:28 +0200 Message-ID: <20260521112729.1287282-4-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.0 on 10.30.177.17 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: 1779362900467154100 String's doc comment is useless. Replace its use in NetdevUserOptions by identical types with hopefully useful documentation. While there, add a non-doc comment explaining why the port forwarding interface is problematic. Signed-off-by: Markus Armbruster Message-ID: <20260506105421.2461117-4-armbru@redhat.com> Reviewed-by: Marc-Andr=C3=A9 Lureau [Commit message typo fixed] --- qapi/net.json | 52 ++++++++++++++++++++++++++++++++++++++++++++++++--- net/slirp.c | 27 ++++++++++++++++++++------ 2 files changed, 70 insertions(+), 9 deletions(-) diff --git a/qapi/net.json b/qapi/net.json index c95aa909a0..2f85956c32 100644 --- a/qapi/net.json +++ b/qapi/net.json @@ -264,6 +264,52 @@ '*param': ['PasstParameter'] }, 'if': 'CONFIG_PASST' } =20 +## +# @NetdevUserDomainSuffix: +# +# @str: DNS domain name suffix for host name lookup, similar to +# resolv.conf(5) +# +# Since: 1.2 +## +{ 'struct': 'NetdevUserDomainSuffix', + 'data': { + 'str': 'str' } } + +## +# @NetdevUserHostForward: +# +# @str: Host port forwarding rule +# +# TODO: This string gets parsed by slirp_hostfwd(). We fail to +# document syntax and semantics here. We do in qemu-options.hx. +# Parsing structured configuration from strings is a no-no for QMP. +# This should really be a struct. Not sure it's worth the bother +# now. +# +# Since: 1.2 +## +{ 'struct': 'NetdevUserHostForward', + 'data': { + 'str': 'str' } } + +## +# @NetdevUserGuestForward: +# +# @str: Guest port forwarding rule +# +# TODO: This string gets parsed by slirp_guestfwd(). We fail to +# document syntax and semantics here. We do in qemu-options.hx. +# Parsing structured configuration from strings is a no-no for QMP. +# This should really be a struct. Not sure it's worth the bother +# now. +# +# Since: 1.2 +## +{ 'struct': 'NetdevUserGuestForward', + 'data': { + 'str': 'str' } } + ## # @NetdevUserOptions: # @@ -340,7 +386,7 @@ '*bootfile': 'str', '*dhcpstart': 'str', '*dns': 'str', - '*dnssearch': ['String'], + '*dnssearch': ['NetdevUserDomainSuffix'], '*domainname': 'str', '*ipv6-prefix': 'str', '*ipv6-prefixlen': 'int', @@ -348,8 +394,8 @@ '*ipv6-dns': 'str', '*smb': 'str', '*smbserver': 'str', - '*hostfwd': ['String'], - '*guestfwd': ['String'], + '*hostfwd': ['NetdevUserHostForward'], + '*guestfwd': ['NetdevUserGuestForward'], '*tftp-server-name': 'str' } } =20 ## diff --git a/net/slirp.c b/net/slirp.c index 04925f3318..a00e0a9651 100644 --- a/net/slirp.c +++ b/net/slirp.c @@ -1215,14 +1215,14 @@ void hmp_info_usernet(Monitor *mon, const QDict *qd= ict) } =20 static void -net_init_slirp_configs(const StringList *fwd, int flags) +net_init_slirp_configs_host(const NetdevUserHostForwardList *fwd) { while (fwd) { struct slirp_config_str *config; =20 config =3D g_malloc0(sizeof(*config)); pstrcpy(config->str, sizeof(config->str), fwd->value->str); - config->flags =3D flags; + config->flags =3D SLIRP_CFG_HOSTFWD; config->next =3D slirp_configs; slirp_configs =3D config; =20 @@ -1230,9 +1230,24 @@ net_init_slirp_configs(const StringList *fwd, int fl= ags) } } =20 -static const char **slirp_dnssearch(const StringList *dnsname) +static void +net_init_slirp_configs_guest(const NetdevUserGuestForwardList *fwd) { - const StringList *c =3D dnsname; + while (fwd) { + struct slirp_config_str *config; + + config =3D g_malloc0(sizeof(*config)); + pstrcpy(config->str, sizeof(config->str), fwd->value->str); + config->next =3D slirp_configs; + slirp_configs =3D config; + + fwd =3D fwd->next; + } +} + +static const char **slirp_dnssearch(const NetdevUserDomainSuffixList *dnsn= ame) +{ + const NetdevUserDomainSuffixList *c =3D dnsname; size_t i =3D 0, num_opts =3D 0; const char **ret; =20 @@ -1285,8 +1300,8 @@ int net_init_slirp(const Netdev *netdev, const char *= name, =20 /* all optional fields are initialized to "all bits zero" */ =20 - net_init_slirp_configs(user->hostfwd, SLIRP_CFG_HOSTFWD); - net_init_slirp_configs(user->guestfwd, 0); + net_init_slirp_configs_host(user->hostfwd); + net_init_slirp_configs_guest(user->guestfwd); =20 ret =3D net_slirp_init(peer, "user", name, user->q_restrict, ipv4, vnet, user->host, --=20 2.54.0 From nobody Sat May 30 17:44:05 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=1779362898; cv=none; d=zohomail.com; s=zohoarc; b=EPbIyecXr/qYi+8MOFhZpjme4RHOdwTDR2bw4KCFITP6c66hPpbg0hOwmtwf3YSnQvDVKSw045bkItyCumnr0hzY4uoB3+iMptCqPMUsGNNl7bla9XfsZASZ1OGiPoEdTaGrdrpgYeRumlYCPBvxhudJhxFi1uZyO72WsmUVCYU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779362898; 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=dLvkJgjFHUDI2wY7bL79wMAH/p5tWbDR+ogPTIhGiRc=; b=J6mkUOdvgxNsuodMI/5DGFfjhAWFJfzyE6ZopaOlIP/EQeFyxoPf9dLG2aKVwvJvhfmQ9I4XcSL6/XynfPfJXQ/K6JWdrl6KMvUj8srOLj8moY6w7NXooUySsaB45Ej1SvXIHcvwuqfw+8qzG0LT7hAAdegQCD006c1paq/2SWc= 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 1779362898061384.7233228981685; Thu, 21 May 2026 04:28:18 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wQ1Z3-0004Wd-2h; Thu, 21 May 2026 07:27:45 -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 1wQ1Yx-0004Vh-VS for qemu-devel@nongnu.org; Thu, 21 May 2026 07:27:43 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wQ1Yu-0003UC-HH for qemu-devel@nongnu.org; Thu, 21 May 2026 07:27:39 -0400 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-151-lhoweoTeNkSkhtJzOysAgQ-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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 26A6A18002D7 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 D9F93300019F for ; Thu, 21 May 2026 11:27:31 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 6645721E6A07; 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=1779362855; 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=dLvkJgjFHUDI2wY7bL79wMAH/p5tWbDR+ogPTIhGiRc=; b=QbMcZt3izN5MPzVWV/iuG7y4lJ9Z7nt0Iq5Ir6J/d5mTgMqYdtNlrUf7NpINA8y3KnEL6r aJEF5sjXKCj58JQeQMxqxpRajqXuLASiPORXWylV8CJaaJVLynels+ATVR+tEgCK92MQdw rnbRGj1iPTFO8G0numhqRTPwbzBSnIg= X-MC-Unique: lhoweoTeNkSkhtJzOysAgQ-1 X-Mimecast-MFC-AGG-ID: lhoweoTeNkSkhtJzOysAgQ_1779362852 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PULL 4/4] qapi/net: Drop unused type String Date: Thu, 21 May 2026 13:27:29 +0200 Message-ID: <20260521112729.1287282-5-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.129.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham 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: 1779362899558158500 Signed-off-by: Markus Armbruster Message-ID: <20260506105421.2461117-5-armbru@redhat.com> Reviewed-by: Marc-Andr=C3=A9 Lureau --- qapi/net.json | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/qapi/net.json b/qapi/net.json index 2f85956c32..1a6382825c 100644 --- a/qapi/net.json +++ b/qapi/net.json @@ -103,17 +103,6 @@ '*addr': 'str', '*vectors': 'uint32' } } =20 -## -# @String: -# -# A fat type wrapping 'str', to be embedded in lists. -# -# Since: 1.2 -## -{ 'struct': 'String', - 'data': { - 'str': 'str' } } - ## # @PasstSearch: # --=20 2.54.0