diff options
| author | Eric Blake <eblake@redhat.com> | 2015-10-26 16:34:56 -0600 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2015-11-02 08:30:27 +0100 |
| commit | 8d0bcba8370a4e8606dee602393a14d0c48e8bfc (patch) | |
| tree | 1df87a06cd1806f9216d51b51164ed82546a83f1 /net/slirp.c | |
| parent | 2d32addae70987521578d8bb27c6b3f52cdcbdcb (diff) | |
| download | qemu-8d0bcba8370a4e8606dee602393a14d0c48e8bfc.zip qemu-8d0bcba8370a4e8606dee602393a14d0c48e8bfc.tar.gz qemu-8d0bcba8370a4e8606dee602393a14d0c48e8bfc.tar.bz2 | |
net: Convert to new qapi union layout
We have two issues with our qapi union layout:
1) Even though the QMP wire format spells the tag 'type', the
C code spells it 'kind', requiring some hacks in the generator.
2) The C struct uses an anonymous union, which places all tag
values in the same namespace as all non-variant members. This
leads to spurious collisions if a tag value matches a non-variant
member's name.
Make the conversion to the new layout for net-related code.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1445898903-12082-18-git-send-email-eblake@redhat.com>
[Commit message tweaked slightly]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
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 7657b38f..f505570 100644 --- a/net/slirp.c +++ b/net/slirp.c @@ -746,8 +746,8 @@ int net_init_slirp(const NetClientOptions *opts, const char *name, const NetdevUserOptions *user; const char **dnssearch; - assert(opts->kind == NET_CLIENT_OPTIONS_KIND_USER); - user = opts->user; + assert(opts->type == NET_CLIENT_OPTIONS_KIND_USER); + user = opts->u.user; vnet = user->has_net ? g_strdup(user->net) : user->has_ip ? g_strdup_printf("%s/24", user->ip) : |