Skip to contentSkip to conversation

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

PATCH Applied Jens Freimann 2 participants 3 messages Sep 27, 2017 – Oct 11, 2017

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 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

Quoted 1 line

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 <[email protected]>
Fixes 0f8c289ad539feb5135c545bea947b310a893f4b

---
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(-)
net/socket.c +2 -2
index e6b471c63d..83a2a31025 100644
@@ -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;
Signature · 1 line
2.13.5
#1 lore raw

ping

Quoted 44 lines · Jens Freimann

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

Quoted 1 line

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 <[email protected]>
Fixes 0f8c289ad539feb5135c545bea947b310a893f4b

---
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(-)
net/socket.c +2 -2
index e6b471c63d..83a2a31025 100644
@@ -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;
Signature · 1 line
2.13.5
Applied
#2 lore raw
Quoted 37 lines · Jens Freimann

ping

Quoted 34 lines · Jens Freimann

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

Quoted 1 line

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 <[email protected]>
Fixes 0f8c289ad539feb5135c545bea947b310a893f4b

---
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(-)
net/socket.c +0 -0
index e6b471c63d..83a2a31025 100644
@@ -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;
 
Quoted 13 lines
Quoted 12 lines
net/socket.c +1 -2
-    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;

Signature · 1 line
2.13.5

Applied, thanks.