diff options
| author | Peter Maydell | 2015-11-02 12:11:39 +0100 |
|---|---|---|
| committer | Peter Maydell | 2015-11-02 12:11:39 +0100 |
| commit | 3d861a01093f8eedfac9889746ccafcfd32039b7 (patch) | |
| tree | b4461467118fb7d067745cc3c7e00576cefd6942 /net/vhost-user.c | |
| parent | Merge remote-tracking branch 'remotes/rth/tags/pull-tile-20151030' into staging (diff) | |
| parent | qapi: Simplify gen_struct_field() (diff) | |
| download | qemu-3d861a01093f8eedfac9889746ccafcfd32039b7.tar.gz qemu-3d861a01093f8eedfac9889746ccafcfd32039b7.tar.xz qemu-3d861a01093f8eedfac9889746ccafcfd32039b7.zip | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2015-11-02' into staging
QAPI patches
# gpg: Signature made Mon 02 Nov 2015 09:07:23 GMT using RSA key ID EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>"
* remotes/armbru/tags/pull-qapi-2015-11-02: (25 commits)
qapi: Simplify gen_struct_field()
qapi: Reserve 'u' member name
qapi: Finish converting to new qapi union layout
tpm: Convert to new qapi union layout
memory: Convert to new qapi union layout
input: Convert to new qapi union layout
char: Convert to new qapi union layout
net: Convert to new qapi union layout
sockets: Convert to new qapi union layout
block: Convert to new qapi union layout
tests: Convert to new qapi union layout
qapi-visit: Convert to new qapi union layout
qapi: Start converting to new qapi union layout
qapi-visit: Remove redundant functions for flat union base
qapi: Unbox base members
qapi: Prefer typesafe upcasts to qapi base classes
qapi-types: Refactor base fields output
qapi-visit: Split off visit_type_FOO_fields forward decl
vnc: Hoist allocation of VncBasicInfo to callers
qapi: Reserve 'q_*' and 'has_*' member names
...
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'net/vhost-user.c')
| -rw-r--r-- | net/vhost-user.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/vhost-user.c b/net/vhost-user.c index 17b5c2a722..0ebd7df528 100644 --- a/net/vhost-user.c +++ b/net/vhost-user.c @@ -301,8 +301,8 @@ int net_init_vhost_user(const NetClientOptions *opts, const char *name, const NetdevVhostUserOptions *vhost_user_opts; CharDriverState *chr; - assert(opts->kind == NET_CLIENT_OPTIONS_KIND_VHOST_USER); - vhost_user_opts = opts->vhost_user; + assert(opts->type == NET_CLIENT_OPTIONS_KIND_VHOST_USER); + vhost_user_opts = opts->u.vhost_user; chr = net_vhost_parse_chardev(vhost_user_opts, errp); if (!chr) { |