diff options
| author | Peter Maydell | 2020-07-16 14:12:05 +0200 |
|---|---|---|
| committer | Peter Maydell | 2020-07-16 14:12:05 +0200 |
| commit | ee5128bb00f90dd301991d80d1db5224ce924c84 (patch) | |
| tree | 334afadd110954829ca0d7ac09b83c8f3b0d4d9e /include/qemu | |
| parent | Update version for v5.1.0-rc0 release (diff) | |
| parent | ftgmac100: fix dblac write test (diff) | |
| download | qemu-ee5128bb00f90dd301991d80d1db5224ce924c84.tar.gz qemu-ee5128bb00f90dd301991d80d1db5224ce924c84.tar.xz qemu-ee5128bb00f90dd301991d80d1db5224ce924c84.zip | |
Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging
# gpg: Signature made Wed 15 Jul 2020 14:49:07 BST
# gpg: using RSA key EF04965B398D6211
# gpg: Good signature from "Jason Wang (Jason Wang on RedHat) <jasowang@redhat.com>" [marginal]
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg: It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 215D 46F4 8246 689E C77F 3562 EF04 965B 398D 6211
* remotes/jasowang/tags/net-pull-request:
ftgmac100: fix dblac write test
net: detect errors from probing vnet hdr flag for TAP devices
net: check if the file descriptor is valid before using it
qemu-options.hx: Clean up and fix typo for colo-compare
net/colo-compare.c: Expose compare "max_queue_size" to users
hw/net: Added CSO for IPv6
virtio-net: fix removal of failover device
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/qemu')
| -rw-r--r-- | include/qemu/sockets.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/qemu/sockets.h b/include/qemu/sockets.h index 57cd049d6e..7d1f813576 100644 --- a/include/qemu/sockets.h +++ b/include/qemu/sockets.h @@ -18,6 +18,7 @@ int qemu_accept(int s, struct sockaddr *addr, socklen_t *addrlen); int socket_set_cork(int fd, int v); int socket_set_nodelay(int fd); void qemu_set_block(int fd); +int qemu_try_set_nonblock(int fd); void qemu_set_nonblock(int fd); int socket_set_fast_reuse(int fd); |