diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-11-01 11:13:59 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-11-01 11:13:59 -0500 |
| commit | d971919f08ca300e7b3595a4c5ddaea2ce8fc3ba (patch) | |
| tree | 4bef68afad713ada32f674e232b496fc62dca073 /net/socket.c | |
| parent | 5a34dbb55994ddb8e3f4cc465abbb85aa2e6dfaf (diff) | |
| parent | 372254c6e5c078fb13b236bb648d2b9b2b0c70f1 (diff) | |
| download | qemu-d971919f08ca300e7b3595a4c5ddaea2ce8fc3ba.zip qemu-d971919f08ca300e7b3595a4c5ddaea2ce8fc3ba.tar.gz qemu-d971919f08ca300e7b3595a4c5ddaea2ce8fc3ba.tar.bz2 | |
Merge remote-tracking branch 'stefanha/net' into staging
* stefanha/net:
e1000: pre-initialize RAH/RAL registers
net: Reject non-netdevs in qmp_netdev_del()
net: use "socket" model name for UDP sockets
e1000: drop check_rxov, always treat RX ring with RDH == RDT as empty
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'net/socket.c')
| -rw-r--r-- | net/socket.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/socket.c b/net/socket.c index b75d567..c01323d 100644 --- a/net/socket.c +++ b/net/socket.c @@ -747,7 +747,7 @@ int net_init_socket(const NetClientOptions *opts, const char *name, error_report("localaddr= is mandatory with udp="); return -1; } - if (net_socket_udp_init(peer, "udp", name, sock->udp, sock->localaddr) == + if (net_socket_udp_init(peer, "socket", name, sock->udp, sock->localaddr) == -1) { return -1; } |