From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:53891) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UDtv5-0007Pv-Vf for qemu-devel@nongnu.org; Fri, 08 Mar 2013 04:48:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UDtv0-000825-Vk for qemu-devel@nongnu.org; Fri, 08 Mar 2013 04:48:55 -0500 Received: from mx1.redhat.com ([209.132.183.28]:61142) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UDtv0-000821-OS for qemu-devel@nongnu.org; Fri, 08 Mar 2013 04:48:50 -0500 From: Stefan Hajnoczi Date: Fri, 8 Mar 2013 10:48:36 +0100 Message-Id: <1362736116-31460-6-git-send-email-stefanha@redhat.com> In-Reply-To: <1362736116-31460-1-git-send-email-stefanha@redhat.com> References: <1362736116-31460-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PATCH 5/5] osdep: replace setsockopt by qemu_setsockopt List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony Liguori , Lei Li , Stefan Hajnoczi From: Lei Li Fix the compiler warning when cross build qemu-ga for windows by using qemu_setsockopt() instead of setsockopt(). util/osdep.c: In function 'socket_set_nodelay': util/osdep.c:69:5: warning: passing argument 4 of 'setsockopt' from incompatible pointer type [enabled by default] In file included from /home/lei/qemu_b/include/sysemu/os-win32.h:30:0, from /home/lei/qemu_b/include/qemu-common.h:46, from util/osdep.c:48: /usr/i686-w64-mingw32/sys-root/mingw/include/winsock2.h:990:63: note: expected 'const char *' but argument is of type 'int *' Signed-off-by: Lei Li Signed-off-by: Stefan Hajnoczi --- util/osdep.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/util/osdep.c b/util/osdep.c index c408261..bd59ac9 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) -- 1.8.1.4