Re: [Qemu-devel] [PATCH v3] net: fix check for number of parameters to -netdev socket

[Jens Freimann <jfreimann@redhat.com>]

ping

On Wed, Sep 27, 2017 at 03:21:18PM +0000, Jens Freimann wrote:
>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>
>Fixes: 0f8c289ad539feb5135c545bea947b310a893f4b
>Reported-by: Mao Zhongyi <maozy.fnst@cn.fujitsu.com>
>Signed-off-by: Jens Freimann <jfreimann@redhat.com>
>
>---
>v2->v3:
>- go back to the original check != 1. No need for more than one
>  argument, putting sock->has_fd back into the calculation is enough
>
>v1->v2:
>- add check to prevent listen= and connect= being used at the same time
>
> net/socket.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/net/socket.c b/net/socket.c
>index e6b471c63d..83a2a31025 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;
>-- 
>2.13.5
>
>