[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 1/8] net: fix check for number of parameters to -netd
From: |
Jason Wang |
Subject: |
[Qemu-devel] [PULL 1/8] net: fix check for number of parameters to -netdev socket |
Date: |
Tue, 14 Nov 2017 10:11:31 +0800 |
From: Jens Freimann <address@hidden>
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 <address@hidden>
Cc: address@hidden
Fixes: 0f8c289ad539feb5135c545bea947b310a893f4b
Reported-by: Mao Zhongyi <address@hidden>
Signed-off-by: Jens Freimann <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
---
net/socket.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/socket.c b/net/socket.c
index e6b471c..83a2a31 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.7.4
- [Qemu-devel] [PULL 0/8] Net patches, Jason Wang, 2017/11/13
- [Qemu-devel] [PULL 1/8] net: fix check for number of parameters to -netdev socket,
Jason Wang <=
- [Qemu-devel] [PULL 2/8] colo-compare: Insert packet into the suitable position of packet queue directly, Jason Wang, 2017/11/13
- [Qemu-devel] [PULL 3/8] colo-compare: compare the packet in a specified Connection, Jason Wang, 2017/11/13
- [Qemu-devel] [PULL 4/8] colo-compare: Fix comments, Jason Wang, 2017/11/13
- [Qemu-devel] [PULL 6/8] Fix eepro100 simple transmission mode, Jason Wang, 2017/11/13
- [Qemu-devel] [PULL 5/8] colo: Consolidate the duplicate code chunk into a routine, Jason Wang, 2017/11/13
- [Qemu-devel] [PULL 7/8] Add new PCI ID for i82559a, Jason Wang, 2017/11/13