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/vmnet-shared.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/vmnet-shared.c')
| -rw-r--r-- | net/vmnet-shared.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/net/vmnet-shared.c b/net/vmnet-shared.c index 18cadc72bd..40c7306a75 100644 --- a/net/vmnet-shared.c +++ b/net/vmnet-shared.c @@ -31,12 +31,12 @@ static bool validate_options(const Netdev *netdev, Error **errp) } #endif - if ((options->has_start_address || - options->has_end_address || - options->has_subnet_mask) && - !(options->has_start_address && - options->has_end_address && - options->has_subnet_mask)) { + if ((options->start_address || + options->end_address || + options->subnet_mask) && + !(options->start_address && + options->end_address && + options->subnet_mask)) { error_setg(errp, "'start-address', 'end-address', 'subnet-mask' " "should be provided together" @@ -58,13 +58,13 @@ static xpc_object_t build_if_desc(const Netdev *netdev) VMNET_SHARED_MODE ); - if (options->has_nat66_prefix) { + if (options->nat66_prefix) { xpc_dictionary_set_string(if_desc, vmnet_nat66_prefix_key, options->nat66_prefix); } - if (options->has_start_address) { + if (options->start_address) { xpc_dictionary_set_string(if_desc, vmnet_start_address_key, options->start_address); |