diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-03-04 08:22:48 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-03-04 08:22:48 -0600 |
| commit | 71df81afc618da79008a7071a666cf97b62e1237 (patch) | |
| tree | 9452cebbcd6f1b769b460b4994f6a748e82c9b0f /include | |
| parent | a6900601caf2286a704bdc42da33e98c65feb3a9 (diff) | |
| parent | 272d2d8e1241b92ab9be87b2c8fb590fd84987a8 (diff) | |
| download | qemu-71df81afc618da79008a7071a666cf97b62e1237.zip qemu-71df81afc618da79008a7071a666cf97b62e1237.tar.gz qemu-71df81afc618da79008a7071a666cf97b62e1237.tar.bz2 | |
Merge remote-tracking branch 'stefanha/block' into staging
# By MORITA Kazutaka (5) and others
# Via Stefan Hajnoczi
* stefanha/block:
block: for HMP commit() operations on 'all', skip non-COW drives
sheepdog: add support for connecting to unix domain socket
sheepdog: use inet_connect to simplify connect code
sheepdog: accept URIs
move socket_set_nodelay to osdep.c
slirp/tcp_subr.c: fix coding style in tcp_connect
dataplane: remove EventPoll in favor of AioContext
virtio-blk: fix unplug + virsh reboot
ide/macio: Fix macio DMA initialisation.
Diffstat (limited to 'include')
| -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 803ae17..6125bf7 100644 --- a/include/qemu/sockets.h +++ b/include/qemu/sockets.h @@ -34,6 +34,7 @@ int inet_aton(const char *cp, struct in_addr *ia); int qemu_socket(int domain, int type, int protocol); 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 socket_set_block(int fd); void socket_set_nonblock(int fd); int send_all(int fd, const void *buf, int len1); |