diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-03-10 19:33:03 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-03-10 19:33:03 -0500 |
| commit | 6a245c666d02210b8461952eccc17379fdeedd9f (patch) | |
| tree | 82e0ea4a8f65ae90c6cdbc6c0efecf4c3416a677 /util | |
| parent | 6d06368d6bebad74fd16ef76a6bbea0c1cb63c9a (diff) | |
| parent | db2d5eba652ecb7420ac4ef79fc747ef391ad0d9 (diff) | |
| download | qemu-6a245c666d02210b8461952eccc17379fdeedd9f.tar.gz | |
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
# By Lei Li (2) and others
# Via Stefan Hajnoczi
* stefanha/trivial-patches:
Fix the wrong description in qemu manual
pci_host: Drop write-only address_space field
rng-random: Use qemu_open / qemu_close
configure: Require at least spice-protocol-0.12.3
osdep: replace setsockopt by qemu_setsockopt
lm32: remove unused function
rtc-test: Fix test failures with recent glib
configure: Create link to icon bitmap for out-of-tree builds
Diffstat (limited to 'util')
| -rw-r--r-- | util/osdep.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/util/osdep.c b/util/osdep.c index c4082610df..bd59ac90c1 100644 --- a/util/osdep.c +++ b/util/osdep.c @@ -57,7 +57,7 @@ static const char *qemu_version = QEMU_VERSION; int socket_set_cork(int fd, int v) { #if defined(SOL_TCP) && defined(TCP_CORK) - return setsockopt(fd, SOL_TCP, TCP_CORK, &v, sizeof(v)); + return qemu_setsockopt(fd, SOL_TCP, TCP_CORK, &v, sizeof(v)); #else return 0; #endif @@ -66,7 +66,7 @@ int socket_set_cork(int fd, int v) int socket_set_nodelay(int fd) { int v = 1; - return setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &v, sizeof(v)); + return qemu_setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &v, sizeof(v)); } int qemu_madvise(void *addr, size_t len, int advice) |