[Xen-changelog] [qemu-xen stable-4.10] net: fix check for number of parameters to -netdev socket

[patchbot@xxxxxxx]

commit 69f562ad9efbe7db5f99c879e2ff96d4d8403e46
Author:     Jens Freimann <jfreimann@xxxxxxxxxx>
AuthorDate: Wed Sep 27 17:21:18 2017 +0200
Commit:     Michael Roth <mdroth@xxxxxxxxxxxxxxxxxx>
CommitDate: Wed Dec 6 09:49:07 2017 -0600

    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@xxxxxxxxxx>
    Cc: qemu-stable@xxxxxxxxxx
    Fixes: 0f8c289ad539feb5135c545bea947b310a893f4b
    Reported-by: Mao Zhongyi <maozy.fnst@xxxxxxxxxxxxxx>
    Signed-off-by: Jens Freimann <jfreimann@xxxxxxxxxx>
    Signed-off-by: Jason Wang <jasowang@xxxxxxxxxx>
    (cherry picked from commit ff86d5762552787f1fcb7da695ec4f8c1be754b4)
     Conflicts:
        net/socket.c
    * drop context dep on 0522a959
    Signed-off-by: Michael Roth <mdroth@xxxxxxxxxxxxxxxxxx>
---
 net/socket.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/socket.c b/net/socket.c
index 6664a75..95060e5 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -674,8 +674,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_report("exactly one of listen=, connect=, mcast= or udp="
                      " is required");
         return -1;
--
generated by git-patchbot for /home/xen/git/qemu-xen.git#stable-4.10

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog