Commit ff86d576 authored by Jens Freimann's avatar Jens Freimann Committed by Jason Wang
Browse files

net: fix check for number of parameters to -netdev socket 



Since commit 0f8c289a "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 0f8c289a.

Cc: Jason Wang <jasowang@redhat.com>
Cc: qemu-stable@nongnu.org
Fixes: 0f8c289a
Reported-by: default avatarMao Zhongyi <maozy.fnst@cn.fujitsu.com>
Signed-off-by: default avatarJens Freimann <jfreimann@redhat.com>
Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
parent 4ffa88c9

net/socket.c

+2 −2
Original line number Diff line number Diff line
@@ -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;