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 -net socket socket.c:729: net_init_socket: Assertion `sock->has_udp' failed. Change the check and error message to reflect that at least one of the options has to be specified. An example for when we need more than on is when we hand in a UDP socket. Then we have fd= and udp= as parameters. Cc: Jason Wang <[email protected]> Fixes: 0f8c289ad539feb5135c545bea947b310a893f4b Reported-by: Mao Zhongyi <[email protected]> Signed-off-by: Jens Freimann <[email protected]> --- v1->v2: - add check to prevent listen= and connect= being used at the same time net/socket.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/net/socket.c b/net/socket.c index e6b471c63d..74a2eff2e0 100644 --- a/net/socket.c +++ b/net/socket.c @@ -695,13 +695,18 @@ 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) { - error_setg(errp, "exactly one of listen=, connect=, mcast= or udp=" + if (sock->has_fd + sock->has_listen + sock->has_connect + sock->has_mcast + + sock->has_udp == 0) { + error_setg(errp, "at least one of fd=, listen=, connect=, mcast= or udp=" " is required"); return -1; } + if (sock->has_listen && sock->has_connect) { + error_setg(errp, "listen= and connect= can't be used together"); + return -1; + } + if (sock->has_localaddr && !sock->has_mcast && !sock->has_udp) { error_setg(errp, "localaddr= is only valid with mcast= or udp="); return -1; -- 2.13.5
