Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/1.1/patches/2233397/?format=api
{ "id": 2233397, "url": "http://patchwork.ozlabs.org/api/1.1/patches/2233397/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20260506105421.2461117-4-armbru@redhat.com/", "project": { "id": 14, "url": "http://patchwork.ozlabs.org/api/1.1/projects/14/?format=api", "name": "QEMU Development", "link_name": "qemu-devel", "list_id": "qemu-devel.nongnu.org", "list_email": "qemu-devel@nongnu.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20260506105421.2461117-4-armbru@redhat.com>", "date": "2026-05-06T10:54:20", "name": "[3/4] qapi/net: Wean SLIRP off QAPI type String to improve documentation", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "25899f174a2677bd686a9a9b6a8798d135d4a3ee", "submitter": { "id": 2645, "url": "http://patchwork.ozlabs.org/api/1.1/people/2645/?format=api", "name": "Markus Armbruster", "email": "armbru@redhat.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20260506105421.2461117-4-armbru@redhat.com/mbox/", "series": [ { "id": 502966, "url": "http://patchwork.ozlabs.org/api/1.1/series/502966/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=502966", "date": "2026-05-06T10:54:18", "name": "qapi/net: Some doc improvement and cleanup", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/502966/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/2233397/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2233397/checks/", "tags": {}, "headers": { "Return-Path": "<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@legolas.ozlabs.org", "Authentication-Results": [ "legolas.ozlabs.org;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256\n header.s=mimecast20190719 header.b=F+apn82x;\n\tdkim-atps=neutral", "legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists1p.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)" ], "Received": [ "from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4g9XMj5ZXzz1yJV\n\tfor <incoming@patchwork.ozlabs.org>; Wed, 06 May 2026 20:54:57 +1000 (AEST)", "from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists1p.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from <qemu-devel-bounces@nongnu.org>)\n\tid 1wKZtf-0006Fj-7d; Wed, 06 May 2026 06:54:31 -0400", "from eggs.gnu.org ([2001:470:142:3::10])\n by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from <armbru@redhat.com>) id 1wKZte-0006F4-05\n for qemu-devel@nongnu.org; Wed, 06 May 2026 06:54:30 -0400", "from us-smtp-delivery-124.mimecast.com ([170.10.133.124])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from <armbru@redhat.com>) id 1wKZtb-0001tP-P2\n for qemu-devel@nongnu.org; Wed, 06 May 2026 06:54:29 -0400", "from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com\n (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by\n relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n cipher=TLS_AES_256_GCM_SHA384) id us-mta-556-7qR_V9AZPc2Yy8OOvx_NRg-1; Wed,\n 06 May 2026 06:54:25 -0400", "from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com\n (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93])\n (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest\n SHA256)\n (No client certificate requested)\n by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS\n id 4A6F1180034C; Wed, 6 May 2026 10:54:24 +0000 (UTC)", "from blackfin.pond.sub.org (unknown [10.44.22.2])\n by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with\n ESMTPS\n id DD5961800673; Wed, 6 May 2026 10:54:23 +0000 (UTC)", "by blackfin.pond.sub.org (Postfix, from userid 1000)\n id 7277C21E6A05; Wed, 06 May 2026 12:54:21 +0200 (CEST)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1778064866;\n h=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n to:to:cc:cc:mime-version:mime-version:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=e5i8wuob9yStKtBI6TGXcvDKpPZzpNrPC7UWkmQf2Ms=;\n b=F+apn82x85VM2vZ5tmMGzbqt0ZZBFhXGGyElEHnDmoUNuzPUm7M/5oLd5KjikRgBVMl7rk\n 1t8QO8yvUHo58NnQ9oal6N/YGZS7Swklfa2MHAqBtgfi5Zfr9EO+cQvtIxCb64X88065gk\n oVBwt7q2TrvWom72VzvNxOOnPRtfBUc=", "X-MC-Unique": "7qR_V9AZPc2Yy8OOvx_NRg-1", "X-Mimecast-MFC-AGG-ID": "7qR_V9AZPc2Yy8OOvx_NRg_1778064864", "From": "Markus Armbruster <armbru@redhat.com>", "To": "qemu-devel@nongnu.org", "Cc": "jasowang@redhat.com, lvivier@redhat.com, sbrivio@redhat.com,\n samuel.thibault@ens-lyon.org, marcandre.lureau@redhat.com", "Subject": "[PATCH 3/4] qapi/net: Wean SLIRP off QAPI type String to improve\n 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": "8bit", "X-Scanned-By": "MIMEDefang 3.4.1 on 10.30.177.93", "Received-SPF": "pass client-ip=170.10.133.124; envelope-from=armbru@redhat.com;\n 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,\n DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001,\n 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 <qemu-devel.nongnu.org>", "List-Unsubscribe": "<https://lists.nongnu.org/mailman/options/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>", "List-Archive": "<https://lists.nongnu.org/archive/html/qemu-devel>", "List-Post": "<mailto:qemu-devel@nongnu.org>", "List-Help": "<mailto:qemu-devel-request@nongnu.org?subject=help>", "List-Subscribe": "<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=subscribe>", "Errors-To": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org", "Sender": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org" }, "content": "String's doc comment is useless. Replace its use in NetdevUserOptions\nby identical types with hopefully useful documentation.\n\nWhile there, add a non-doc commment explaining why the port forwarding\ninterface is problematic.\n\nSigned-off-by: Markus Armbruster <armbru@redhat.com>\n---\n qapi/net.json | 52 ++++++++++++++++++++++++++++++++++++++++++++++++---\n net/slirp.c | 27 ++++++++++++++++++++------\n 2 files changed, 70 insertions(+), 9 deletions(-)", "diff": "diff --git a/qapi/net.json b/qapi/net.json\nindex 45ee7ac7ff..aabf116d16 100644\n--- a/qapi/net.json\n+++ b/qapi/net.json\n@@ -264,6 +264,52 @@\n '*param': ['PasstParameter'] },\n 'if': 'CONFIG_PASST' }\n \n+##\n+# @NetdevUserDomainSuffix:\n+#\n+# @str: DNS domain name suffix for host name lookup, similar to\n+# resolv.conf(5)\n+#\n+# Since: 1.2\n+##\n+{ 'struct': 'NetdevUserDomainSuffix',\n+ 'data': {\n+ 'str': 'str' } }\n+\n+##\n+# @NetdevUserHostForward:\n+#\n+# @str: Host port forwarding rule\n+#\n+# TODO: This string gets parsed by slirp_hostfwd(). We fail to\n+# document syntax and semantics here. We do in qemu-options.hx.\n+# Parsing structured configuration from strings is a no-no for QMP.\n+# This should really be a struct. Not sure it's worth the bother\n+# now.\n+#\n+# Since: 1.2\n+##\n+{ 'struct': 'NetdevUserHostForward',\n+ 'data': {\n+ 'str': 'str' } }\n+\n+##\n+# @NetdevUserGuestForward:\n+#\n+# @str: Guest port forwarding rule\n+#\n+# TODO: This string gets parsed by slirp_guestfwd(). We fail to\n+# document syntax and semantics here. We do in qemu-options.hx.\n+# Parsing structured configuration from strings is a no-no for QMP.\n+# This should really be a struct. Not sure it's worth the bother\n+# now.\n+#\n+# Since: 1.2\n+##\n+{ 'struct': 'NetdevUserGuestForward',\n+ 'data': {\n+ 'str': 'str' } }\n+\n ##\n # @NetdevUserOptions:\n #\n@@ -340,7 +386,7 @@\n '*bootfile': 'str',\n '*dhcpstart': 'str',\n '*dns': 'str',\n- '*dnssearch': ['String'],\n+ '*dnssearch': ['NetdevUserDomainSuffix'],\n '*domainname': 'str',\n '*ipv6-prefix': 'str',\n '*ipv6-prefixlen': 'int',\n@@ -348,8 +394,8 @@\n '*ipv6-dns': 'str',\n '*smb': 'str',\n '*smbserver': 'str',\n- '*hostfwd': ['String'],\n- '*guestfwd': ['String'],\n+ '*hostfwd': ['NetdevUserHostForward'],\n+ '*guestfwd': ['NetdevUserGuestForward'],\n '*tftp-server-name': 'str' } }\n \n ##\ndiff --git a/net/slirp.c b/net/slirp.c\nindex 04925f3318..a00e0a9651 100644\n--- a/net/slirp.c\n+++ b/net/slirp.c\n@@ -1215,14 +1215,14 @@ void hmp_info_usernet(Monitor *mon, const QDict *qdict)\n }\n \n static void\n-net_init_slirp_configs(const StringList *fwd, int flags)\n+net_init_slirp_configs_host(const NetdevUserHostForwardList *fwd)\n {\n while (fwd) {\n struct slirp_config_str *config;\n \n config = g_malloc0(sizeof(*config));\n pstrcpy(config->str, sizeof(config->str), fwd->value->str);\n- config->flags = flags;\n+ config->flags = SLIRP_CFG_HOSTFWD;\n config->next = slirp_configs;\n slirp_configs = config;\n \n@@ -1230,9 +1230,24 @@ net_init_slirp_configs(const StringList *fwd, int flags)\n }\n }\n \n-static const char **slirp_dnssearch(const StringList *dnsname)\n+static void\n+net_init_slirp_configs_guest(const NetdevUserGuestForwardList *fwd)\n {\n- const StringList *c = dnsname;\n+ while (fwd) {\n+ struct slirp_config_str *config;\n+\n+ config = g_malloc0(sizeof(*config));\n+ pstrcpy(config->str, sizeof(config->str), fwd->value->str);\n+ config->next = slirp_configs;\n+ slirp_configs = config;\n+\n+ fwd = fwd->next;\n+ }\n+}\n+\n+static const char **slirp_dnssearch(const NetdevUserDomainSuffixList *dnsname)\n+{\n+ const NetdevUserDomainSuffixList *c = dnsname;\n size_t i = 0, num_opts = 0;\n const char **ret;\n \n@@ -1285,8 +1300,8 @@ int net_init_slirp(const Netdev *netdev, const char *name,\n \n /* all optional fields are initialized to \"all bits zero\" */\n \n- net_init_slirp_configs(user->hostfwd, SLIRP_CFG_HOSTFWD);\n- net_init_slirp_configs(user->guestfwd, 0);\n+ net_init_slirp_configs_host(user->hostfwd);\n+ net_init_slirp_configs_guest(user->guestfwd);\n \n ret = net_slirp_init(peer, \"user\", name, user->q_restrict,\n ipv4, vnet, user->host,\n", "prefixes": [ "3/4" ] }