From nobody Thu Jun 25 13:21: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=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 --- 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