String's doc comment is useless. Replace its use in
NetDevPasstOptions by identical types with hopefully useful
documentation.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
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' } }
+##
+# @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' }
##
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 NetdevPasstOptions *passt,
}
if (passt->has_search && passt->search) {
- const StringList *list = passt->search;
+ const PasstSearchList *list = passt->search;
GString *domains = g_string_new(list->value->str);
list = list->next;
@@ -656,7 +656,7 @@ static GPtrArray *net_passt_decode_args(const NetdevPasstOptions *passt,
}
if (passt->has_tcp_ports && passt->tcp_ports) {
- const StringList *list = passt->tcp_ports;
+ const PasstPortForwardList *list = passt->tcp_ports;
GString *tcp_ports = g_string_new(list->value->str);
list = list->next;
@@ -671,7 +671,7 @@ static GPtrArray *net_passt_decode_args(const NetdevPasstOptions *passt,
}
if (passt->has_udp_ports && passt->udp_ports) {
- const StringList *list = passt->udp_ports;
+ const PasstPortForwardList *list = passt->udp_ports;
GString *udp_ports = g_string_new(list->value->str);
list = list->next;
@@ -686,7 +686,7 @@ static GPtrArray *net_passt_decode_args(const NetdevPasstOptions *passt,
}
if (passt->has_param && passt->param) {
- const StringList *list = passt->param;
+ const PasstParameterList *list = passt->param;
while (list) {
g_ptr_array_add(args, g_strdup(list->value->str));
--
2.54.0
On Wed, 06 May 2026 12:54:19 +0200, Markus Armbruster <armbru@redhat.com> wrote:
> diff --git a/qapi/net.json b/qapi/net.json
> index 8ed51b665cd..45ee7ac7ffc 100644
> --- a/qapi/net.json
> +++ b/qapi/net.json
> @@ -114,6 +114,41 @@
> 'data': {
> 'str': 'str' } }
>
> +##
> +# @PasstSearch:
> +#
> +# @str: DNS domain name suffix for host name lookup, or "none". See
> +# passt(1) option --search.
> +#
> +# Since: 1.2
Since 10.1
--
Marc-André Lureau <marcandre.lureau@redhat.com>
marcandre.lureau@redhat.com writes:
> On Wed, 06 May 2026 12:54:19 +0200, Markus Armbruster <armbru@redhat.com> wrote:
>> diff --git a/qapi/net.json b/qapi/net.json
>> index 8ed51b665cd..45ee7ac7ffc 100644
>> --- a/qapi/net.json
>> +++ b/qapi/net.json
>> @@ -114,6 +114,41 @@
>> 'data': {
>> 'str': 'str' } }
>>
>> +##
>> +# @PasstSearch:
>> +#
>> +# @str: DNS domain name suffix for host name lookup, or "none". See
>> +# passt(1) option --search.
>> +#
>> +# Since: 1.2
>
> Since 10.1
Yes. I score 2 of 3 points.
Thank you!
© 2016 - 2026 Red Hat, Inc.