diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2016-02-26 00:05:57 +0100 |
---|---|---|
committer | Timothy Pearson <tpearson@raptorengineering.com> | 2019-11-29 19:49:13 -0600 |
commit | 912317f1bb2d7873492b2ac354ea8b60cfce3667 (patch) | |
tree | 21022c517aceaafc4b33166f0b0ca4c854798d10 | |
parent | 9d7e316a76c26d297ad24bc153bcf11c186c00d8 (diff) | |
download | hqemu-912317f1bb2d7873492b2ac354ea8b60cfce3667.zip hqemu-912317f1bb2d7873492b2ac354ea8b60cfce3667.tar.gz |
net: simplify net_init_tap_one logic
net_init_tap_one receives in vhostfdname a fd name from vhostfd= or
vhostfds=, or NULL if there is no vhostfd=/vhostfds=. It is simpler
to just check vhostfdname, than it is to check for vhostfd= or
vhostfds=. This also calms down Coverity, which otherwise thinks
that monitor_fd_param could dereference a NULL vhostfdname.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
-rw-r--r-- | net/tap.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -662,7 +662,7 @@ static void net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer, options.backend_type = VHOST_BACKEND_TYPE_KERNEL; options.net_backend = &s->nc; - if (tap->has_vhostfd || tap->has_vhostfds) { + if (vhostfdname) { vhostfd = monitor_fd_param(cur_mon, vhostfdname, &err); if (vhostfd == -1) { error_propagate(errp, err); @@ -684,7 +684,7 @@ static void net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer, "vhost-net requested but could not be initialized"); return; } - } else if (tap->has_vhostfd || tap->has_vhostfds) { + } else if (vhostfdname) { error_setg(errp, "vhostfd= is not valid without vhost"); } } |