From nobody Sat May 30 12:00:26 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=1778064884; cv=none; d=zohomail.com; s=zohoarc; b=S5sH2vdUJLZzr/2vTFuulEhn1pHr0dxZPzawQjlhR17Y39bc+PTyJmG0M6bJcmyaFDoX3y0zZByPnqp0s6MP92Z8vldqjrzY6djDU+vfip/g+YYlVl/J20G9dZS015DmkbLvjXXg5lIBQlYmZMYe4h5Xvw+8fOBMG2HUfAW24A4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778064884; h=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=ebCRNt0qwtOUAI7d7h4u9p6Bm2iACw2XorD/vtJkAqw=; b=Sbf43u9YvfuTB/EkoiACzWAOnMc8dIr4ADrqcg/3jqsP3q4byLr/CtByaRFuSni/3ietDkiRFgvN3ercom3YaVQRMGhB6VJ7BSGwbjG1gnMCRZwRQHOXVKcwjjQJhy6pDEYDPZfBQNlFN2rLmP/MjNmCKk9FhvzPgzBNSZhX/PA= 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 1778064884814332.8748178506638; Wed, 6 May 2026 03:54:44 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKZtf-0006Fs-KO; Wed, 06 May 2026 06:54:31 -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 1wKZte-0006FN-S0 for qemu-devel@nongnu.org; Wed, 06 May 2026 06:54:30 -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 1wKZtc-0001tR-0N for qemu-devel@nongnu.org; Wed, 06 May 2026 06:54:30 -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-274-jZ5U7PsDOKqvwZcPfzeegQ-1; Wed, 06 May 2026 06:54:25 -0400 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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 63825195608E; Wed, 6 May 2026 10:54:24 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.44.22.2]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 03A1A1800352; Wed, 6 May 2026 10:54:23 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 6A22D21E6A02; Wed, 06 May 2026 12:54:21 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1778064866; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ebCRNt0qwtOUAI7d7h4u9p6Bm2iACw2XorD/vtJkAqw=; b=M1WLQk5zuGwOggDcQVSsIwKjsIV88FT0epNsKkztHCXOvactEH8wFxFsxmn/+c6weHw5QJ +IWu8i1YyER1Bf1SEIUMQa/Oa5w9SIbuaL4864JEno6OFVXL5CGs3vG2HVZBTYfQ+G4Nfr f54r3bkNBaBTCmWzGQBIUt5cIdnIZ5A= X-MC-Unique: jZ5U7PsDOKqvwZcPfzeegQ-1 X-Mimecast-MFC-AGG-ID: jZ5U7PsDOKqvwZcPfzeegQ_1778064864 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: jasowang@redhat.com, lvivier@redhat.com, sbrivio@redhat.com, samuel.thibault@ens-lyon.org, marcandre.lureau@redhat.com Subject: [PATCH 1/4] qapi/net: Rename NetDevPasstOptions to NetdevPasstOptions Date: Wed, 6 May 2026 12:54:18 +0200 Message-ID: <20260506105421.2461117-2-armbru@redhat.com> In-Reply-To: <20260506105421.2461117-1-armbru@redhat.com> References: <20260506105421.2461117-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 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.443, 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: 1778064887366154100 Content-Type: text/plain; charset="utf-8" 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 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 4ff94ee509..f1f59d50c4 100644 --- a/net/passt.c +++ b/net/passt.c @@ -499,7 +499,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 12:00:26 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=1778064890; cv=none; d=zohomail.com; s=zohoarc; b=bMABhWfmsMMotPsoi7quudPKuBUswnj9Q30GNw+L2oAAi108gIpfc8JrFPbSVTvpAcG3MzrYRt3inPAJk1I9IUDJqzyfbqRtPBCV0XlDVTQ3pPiBc8VUfbX/54xw3qirvlNJcMfccki9qzyLH0OW8CIQwD1BfuNEIbpaBD2lm5o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778064890; h=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=kP2BTTbO8J+G4Db6gps/2LWhFXSixwowFlBRgG0qrRI=; b=JnhjUZnFZ3k5K9IAloeUhojWoD0btp852Z3C59/2iDYCT+b4i/H0CEidCBiZiSkhceb8gwK0sfzSqnGiNB2j2tYSCO4rCb5mA6tXrJ9aUP8UTd74eME8KFkXU+tZuqxr47xOEwN4nQmKr/VO7csu7LNKRiBwDjn2VfxS3wBjWNE= 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 1778064890415797.9161098009797; Wed, 6 May 2026 03:54:50 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKZtg-0006H3-SY; Wed, 06 May 2026 06:54:32 -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 1wKZtf-0006Fu-KN for qemu-devel@nongnu.org; Wed, 06 May 2026 06:54:31 -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 1wKZtd-0001ti-6m for qemu-devel@nongnu.org; Wed, 06 May 2026 06:54:31 -0400 Received: from mx-prod-mc-06.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-673-BBw0piW9M0uNCPCfp4eE8Q-1; Wed, 06 May 2026 06:54:25 -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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 40AF6180056E; Wed, 6 May 2026 10:54:24 +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 DB36B3002D2D; Wed, 6 May 2026 10:54:23 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 6E55A21E6A03; Wed, 06 May 2026 12:54:21 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1778064868; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kP2BTTbO8J+G4Db6gps/2LWhFXSixwowFlBRgG0qrRI=; b=XKrFZK2NCHBYXaU3vcCyg2T4cFpTHN/qXXzm5x2GeeiDUKSUlie8R/k3H1uN5Suu7FWIKj 7Q6K/FSJBEZvvcHddDDiXDiOJ3dFbAG+4mfXQZ3oivj1mjlnDZfgmWIMrqL5yjjtUceW/E D3KHxkdKhWzF32PDmT/Jl//54dnsezg= X-MC-Unique: BBw0piW9M0uNCPCfp4eE8Q-1 X-Mimecast-MFC-AGG-ID: BBw0piW9M0uNCPCfp4eE8Q_1778064864 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: jasowang@redhat.com, lvivier@redhat.com, sbrivio@redhat.com, samuel.thibault@ens-lyon.org, marcandre.lureau@redhat.com Subject: [PATCH 2/4] qapi/net: Wean passt off QAPI type String to improve documentation Date: Wed, 6 May 2026 12:54:19 +0200 Message-ID: <20260506105421.2461117-3-armbru@redhat.com> In-Reply-To: <20260506105421.2461117-1-armbru@redhat.com> References: <20260506105421.2461117-1-armbru@redhat.com> MIME-Version: 1.0 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.443, 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: 1778064892390158500 Content-Type: text/plain; charset="utf-8" String's doc comment is useless. Replace its use in NetDevPasstOptions by identical types with hopefully useful documentation. Signed-off-by: Markus Armbruster Reviewed-by: Marc-Andr=C3=A9 Lureau --- 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..45ee7ac7ff 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: 1.2 +## +{ '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 f1f59d50c4..53e0a4f444 100644 --- a/net/passt.c +++ b/net/passt.c @@ -641,7 +641,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; @@ -656,7 +656,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; @@ -671,7 +671,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; @@ -686,7 +686,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 12:00:26 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=1778064896; cv=none; d=zohomail.com; s=zohoarc; b=YERVHeyPi1R/JCemUUuYRV8XsRfQaLyoPaxr8VHlflWbOBikywalETS1kmFJMvu5XLGz5/lIS0NgpPHgM+Y7JFx/hHKqC/QmgRW4G+l4QXBL2Dw2T857XtAOqPC29pVfM/9+ltEVmUgNdZK/vyuTnNKE+Ux5swiniFLwuYvbw7A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778064896; h=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=e5i8wuob9yStKtBI6TGXcvDKpPZzpNrPC7UWkmQf2Ms=; b=CmF5exSzfSO6opPTh+QApxxJL7H0s01zPAY0nO5YVu0twSIuXkN1yIjcxN3IL9U8LL+eU87nqG7yrG7dZ/Agy9PMe8rykBv1yFFpbt4PasqecM/sfZj1wrq7YcRagE5FnkmE/N5LqeqN45L67RaakzbOZAe77IS9B8LkQdJbDog= 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 177806489673048.80155775944968; Wed, 6 May 2026 03:54:56 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKZtf-0006Fj-7d; Wed, 06 May 2026 06:54:31 -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 1wKZte-0006F4-05 for qemu-devel@nongnu.org; Wed, 06 May 2026 06:54:30 -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 1wKZtb-0001tP-P2 for qemu-devel@nongnu.org; Wed, 06 May 2026 06:54:29 -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-556-7qR_V9AZPc2Yy8OOvx_NRg-1; Wed, 06 May 2026 06:54:25 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 4A6F1180034C; Wed, 6 May 2026 10:54:24 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.44.22.2]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id DD5961800673; Wed, 6 May 2026 10:54:23 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 7277C21E6A05; Wed, 06 May 2026 12:54:21 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1778064866; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=e5i8wuob9yStKtBI6TGXcvDKpPZzpNrPC7UWkmQf2Ms=; b=F+apn82x85VM2vZ5tmMGzbqt0ZZBFhXGGyElEHnDmoUNuzPUm7M/5oLd5KjikRgBVMl7rk 1t8QO8yvUHo58NnQ9oal6N/YGZS7Swklfa2MHAqBtgfi5Zfr9EO+cQvtIxCb64X88065gk oVBwt7q2TrvWom72VzvNxOOnPRtfBUc= X-MC-Unique: 7qR_V9AZPc2Yy8OOvx_NRg-1 X-Mimecast-MFC-AGG-ID: 7qR_V9AZPc2Yy8OOvx_NRg_1778064864 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: jasowang@redhat.com, lvivier@redhat.com, sbrivio@redhat.com, samuel.thibault@ens-lyon.org, marcandre.lureau@redhat.com Subject: [PATCH 3/4] qapi/net: Wean SLIRP off QAPI type String to improve documentation Date: Wed, 6 May 2026 12:54:20 +0200 Message-ID: <20260506105421.2461117-4-armbru@redhat.com> In-Reply-To: <20260506105421.2461117-1-armbru@redhat.com> References: <20260506105421.2461117-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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: -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.443, 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, 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: 1778064898448158500 Content-Type: text/plain; charset="utf-8" String's doc comment is useless. Replace its use in NetdevUserOptions by identical types with hopefully useful documentation. While there, add a non-doc commment explaining why the port forwarding interface is problematic. Signed-off-by: Markus Armbruster Reviewed-by: Marc-Andr=C3=A9 Lureau --- 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 45ee7ac7ff..aabf116d16 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 12:00:26 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=1778064894; cv=none; d=zohomail.com; s=zohoarc; b=Ed1pJN/bHEBNAjhsTtrcgDPd4Wjw85mL5NJwkfrDlF4LPdnxwWyi0u7FNspps4u9RtzOnJs48bCJ+JaOa6+ktapQfsTJbV1GrwQqlgXzrT+0z2i7psB9HszNxvuLwRUYMPCfoug4jGPyR5T9xr+4dMuIhiAiiav73MSF6fvoH4k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778064894; h=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=5j2OhMLVX9YiXlGvTrsHbqS+qLDWhwNWnjf5LhEK5Ac=; b=aAhce1xlHW8yE2p0YciPEHSsba5bnOf8m+MSVFxTJHkKnrDXz07dnZ8HRtDOP/Ubv01FoeQl4122hRub8MoL0y5WCkqELQtbDH9D5pJowWzs6K3LONeJ5ce7yrYLILLZLtMJFDGcZS1usZKBbnRaRmfIze6xQ5rHXTiMd73dz4w= 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 1778064894483913.5325737423992; Wed, 6 May 2026 03:54:54 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKZtg-0006Gh-Gu; Wed, 06 May 2026 06:54:32 -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 1wKZtf-0006FW-0w for qemu-devel@nongnu.org; Wed, 06 May 2026 06:54:31 -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 1wKZtc-0001te-8r for qemu-devel@nongnu.org; Wed, 06 May 2026 06:54:30 -0400 Received: from mx-prod-mc-06.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-556-WTTeSpkfMUmXTd2qLZvuUg-1; Wed, 06 May 2026 06:54:25 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 73ED218005BF; Wed, 6 May 2026 10:54:24 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.44.22.2]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id DB5511800671; Wed, 6 May 2026 10:54:23 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 766CD21E6A07; Wed, 06 May 2026 12:54:21 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1778064867; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5j2OhMLVX9YiXlGvTrsHbqS+qLDWhwNWnjf5LhEK5Ac=; b=H3MfO9g1ktlhWDGHn/1qNXq0t6UZlZwLTfk9IPGo687jTOMQhDHIoZA8tvTTAbVVvxr9VH HQZumb6Bx6xVmuk2vytRx/OYJyuzeOCDAmoODncQExCHd/1pP9ztu1H6ikInX7VkBJGvv8 TOWP60opKBjuhuTGgdj9hwazYqS611A= X-MC-Unique: WTTeSpkfMUmXTd2qLZvuUg-1 X-Mimecast-MFC-AGG-ID: WTTeSpkfMUmXTd2qLZvuUg_1778064864 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: jasowang@redhat.com, lvivier@redhat.com, sbrivio@redhat.com, samuel.thibault@ens-lyon.org, marcandre.lureau@redhat.com Subject: [PATCH 4/4] qapi/net: Drop unused type String Date: Wed, 6 May 2026 12:54:21 +0200 Message-ID: <20260506105421.2461117-5-armbru@redhat.com> In-Reply-To: <20260506105421.2461117-1-armbru@redhat.com> References: <20260506105421.2461117-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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: -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.443, 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, 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: 1778064896579158500 Content-Type: text/plain; charset="utf-8" Signed-off-by: Markus Armbruster 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 aabf116d16..7dcda6009c 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