aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorJens Freimann <jfreimann@redhat.com>2017-09-27 17:21:18 +0200
committerJason Wang <jasowang@redhat.com>2017-11-13 15:46:37 +0800
commitff86d5762552787f1fcb7da695ec4f8c1be754b4 (patch)
tree33646a03a7fca3d6dc569d5c3ce435d6a5407a5f /net
parent4ffa88c99c54d2a30f79e3dbecec50b023eff1c8 (diff)
downloadqemu-ff86d5762552787f1fcb7da695ec4f8c1be754b4.zip
qemu-ff86d5762552787f1fcb7da695ec4f8c1be754b4.tar.gz
qemu-ff86d5762552787f1fcb7da695ec4f8c1be754b4.tar.bz2
net: fix check for number of parameters to -netdev socket
Since commit 0f8c289ad "net: fix -netdev socket,fd= for UDP sockets" we allow more than one parameter for -netdev socket. But now we run into an assert when no parameter at all is specified > qemu-system-x86_64 -netdev socket socket.c:729: net_init_socket: Assertion `sock->has_udp' failed. Fix this by reverting the change of the if condition done in 0f8c289ad. Cc: Jason Wang <jasowang@redhat.com> Cc: qemu-stable@nongnu.org Fixes: 0f8c289ad539feb5135c545bea947b310a893f4b Reported-by: Mao Zhongyi <maozy.fnst@cn.fujitsu.com> Signed-off-by: Jens Freimann <jfreimann@redhat.com> Signed-off-by: Jason Wang <jasowang@redhat.com>
Diffstat (limited to 'net')
-rw-r--r--net/socket.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/socket.c b/net/socket.c
index e6b471c..83a2a31 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -695,8 +695,8 @@ int net_init_socket(const Netdev *netdev, const char *name,
assert(netdev->type == NET_CLIENT_DRIVER_SOCKET);
sock = &netdev->u.socket;
- if (sock->has_listen + sock->has_connect + sock->has_mcast +
- sock->has_udp > 1) {
+ if (sock->has_fd + sock->has_listen + sock->has_connect + sock->has_mcast +
+ sock->has_udp != 1) {
error_setg(errp, "exactly one of listen=, connect=, mcast= or udp="
" is required");
return -1;