diff options
| author | Markus Armbruster <armbru@redhat.com> | 2022-11-04 17:07:00 +0100 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2022-12-14 20:04:47 +0100 |
| commit | 7480874a69b17000cd10a2f97dbe51580ec44a96 (patch) | |
| tree | 5a2a339dd854d791b55625c1eeecc4b88e627192 /net/slirp.c | |
| parent | 9492718b7c00c0a16e2ce834752b8c200e3217d1 (diff) | |
| download | focaccia-qemu-7480874a69b17000cd10a2f97dbe51580ec44a96.tar.gz focaccia-qemu-7480874a69b17000cd10a2f97dbe51580ec44a96.zip | |
qapi net: Elide redundant has_FOO in generated C
The has_FOO for pointer-valued FOO are redundant, except for arrays. They are also a nuisance to work with. Recent commit "qapi: Start to elide redundant has_FOO in generated C" provided the means to elide them step by step. This is the step for qapi/net.json. Said commit explains the transformation in more detail. The invariant violations mentioned there do not occur here. Cc: Jason Wang <jasowang@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com> Message-Id: <20221104160712.3005652-19-armbru@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> [Fixes for MacOS squashed in]
Diffstat (limited to 'net/slirp.c')
| -rw-r--r-- | net/slirp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/slirp.c b/net/slirp.c index 14a8d59277..2ee3f1a0d7 100644 --- a/net/slirp.c +++ b/net/slirp.c @@ -1153,8 +1153,8 @@ int net_init_slirp(const Netdev *netdev, const char *name, ipv6 = 0; } - vnet = user->has_net ? g_strdup(user->net) : - user->has_ip ? g_strdup_printf("%s/24", user->ip) : + vnet = user->net ? g_strdup(user->net) : + user->ip ? g_strdup_printf("%s/24", user->ip) : NULL; dnssearch = slirp_dnssearch(user->dnssearch); |