starred/qemu
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2026-07-08 17:46:10 +00:00
Code Issues 380 Packages Projects Releases Wiki Activity

qapi/net: Wean SLIRP off QAPI type String to improve documentation

Browse Source 
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 <armbru@redhat.com>
Message-ID: <20260506105421.2461117-4-armbru@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
[Commit message typo fixed]
This commit is contained in:
Markus Armbruster
2026-05-06 12:54:20 +02:00
parent b5efbfb1bb
commit 22ef826531
2 changed files with 70 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
net/slirp.c
View File

@@ -1215,14 +1215,14 @@ void hmp_info_usernet(Monitor *mon, const QDict *qdict)
}
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;
config = g_malloc0(sizeof(*config));
pstrcpy(config->str, sizeof(config->str), fwd->value->str);
config->flags = flags;
config->flags = SLIRP_CFG_HOSTFWD;
config->next = slirp_configs;
slirp_configs = config;
@@ -1230,9 +1230,24 @@ net_init_slirp_configs(const StringList *fwd, int flags)
}
}
static const char **slirp_dnssearch(const StringList *dnsname)
static void
net_init_slirp_configs_guest(const NetdevUserGuestForwardList *fwd)
{
const StringList *c = dnsname;
while (fwd) {
struct slirp_config_str *config;
config = g_malloc0(sizeof(*config));
pstrcpy(config->str, sizeof(config->str), fwd->value->str);
config->next = slirp_configs;
slirp_configs = config;
fwd = fwd->next;
}
}
static const char **slirp_dnssearch(const NetdevUserDomainSuffixList *dnsname)
{
const NetdevUserDomainSuffixList *c = dnsname;
size_t i = 0, num_opts = 0;
const char **ret;
@@ -1285,8 +1300,8 @@ int net_init_slirp(const Netdev *netdev, const char *name,
/* all optional fields are initialized to "all bits zero" */
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);
ret = net_slirp_init(peer, "user", name, user->q_restrict,
ipv4, vnet, user->host,

52
qapi/net.json
View File

@@ -264,6 +264,52 @@
'*param': ['PasstParameter'] },
'if': 'CONFIG_PASST' }
##
# @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' } }
##