diff options
| author | Peter Maydell | 2015-01-16 11:16:14 +0100 |
|---|---|---|
| committer | Peter Maydell | 2015-01-16 11:16:14 +0100 |
| commit | e68cba36360a2ab5bf0576b66df4d0eb0d822f8d (patch) | |
| tree | 933ecff5cc8e380fe38693dc0cca2d7b8e479dfc /include/qemu/sockets.h | |
| parent | Merge remote-tracking branch 'remotes/mjt/tags/pull-trivial-patches-2015-01-1... (diff) | |
| parent | vmstate: type-check sub-arrays (diff) | |
| download | qemu-e68cba36360a2ab5bf0576b66df4d0eb0d822f8d.tar.gz qemu-e68cba36360a2ab5bf0576b66df4d0eb0d822f8d.tar.xz qemu-e68cba36360a2ab5bf0576b66df4d0eb0d822f8d.zip | |
Merge remote-tracking branch 'remotes/amit-migration/tags/mig-2.3-1' into staging
A set of patches collected over the holidays. Mix of optimizations and
fixes.
# gpg: Signature made Fri 16 Jan 2015 07:42:00 GMT using RSA key ID 854083B6
# gpg: Good signature from "Amit Shah <amit@amitshah.net>"
# gpg: aka "Amit Shah <amit@kernel.org>"
# gpg: aka "Amit Shah <amitshah@gmx.net>"
* remotes/amit-migration/tags/mig-2.3-1:
vmstate: type-check sub-arrays
migration_cancel: shutdown migration socket
Handle bi-directional communication for fd migration
socket shutdown
Tests: QEMUSizedBuffer/QEMUBuffer
QEMUSizedBuffer: only free qsb that qemu_bufopen allocated
xbzrle: rebuild the cache_is_cached function
xbzrle: optimize XBZRLE to decrease the cache misses
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/qemu/sockets.h')
| -rw-r--r-- | include/qemu/sockets.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/qemu/sockets.h b/include/qemu/sockets.h index f47dae614a..7992ece72a 100644 --- a/include/qemu/sockets.h +++ b/include/qemu/sockets.h @@ -44,6 +44,13 @@ int socket_set_fast_reuse(int fd); int send_all(int fd, const void *buf, int len1); int recv_all(int fd, void *buf, int len1, bool single_read); +#ifdef WIN32 +/* Windows has different names for the same constants with the same values */ +#define SHUT_RD 0 +#define SHUT_WR 1 +#define SHUT_RDWR 2 +#endif + /* callback function for nonblocking connect * valid fd on success, negative error code on failure */ |