From patchwork Wed Mar 6 14:29:16 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lei Li X-Patchwork-Id: 225509 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id ABE6F2C03BB for ; Thu, 7 Mar 2013 01:30:06 +1100 (EST) Received: from localhost ([::1]:51114 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UDFM4-0000As-Nh for incoming@patchwork.ozlabs.org; Wed, 06 Mar 2013 09:30:04 -0500 Received: from eggs.gnu.org ([208.118.235.92]:49115) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UDFLm-0000An-C8 for qemu-devel@nongnu.org; Wed, 06 Mar 2013 09:29:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UDFLh-0004fy-D1 for qemu-devel@nongnu.org; Wed, 06 Mar 2013 09:29:46 -0500 Received: from e23smtp05.au.ibm.com ([202.81.31.147]:36173) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UDFLg-0004fe-Rg for qemu-devel@nongnu.org; Wed, 06 Mar 2013 09:29:41 -0500 Received: from /spool/local by e23smtp05.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 7 Mar 2013 00:25:24 +1000 Received: from d23dlp02.au.ibm.com (202.81.31.213) by e23smtp05.au.ibm.com (202.81.31.211) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 7 Mar 2013 00:25:22 +1000 Received: from d23relay04.au.ibm.com (d23relay04.au.ibm.com [9.190.234.120]) by d23dlp02.au.ibm.com (Postfix) with ESMTP id EF0E92BB0050 for ; Thu, 7 Mar 2013 01:29:30 +1100 (EST) Received: from d23av01.au.ibm.com (d23av01.au.ibm.com [9.190.234.96]) by d23relay04.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r26EGrBB9306438 for ; Thu, 7 Mar 2013 01:16:54 +1100 Received: from d23av01.au.ibm.com (loopback [127.0.0.1]) by d23av01.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r26ETTTY026897 for ; Thu, 7 Mar 2013 01:29:29 +1100 Received: from localhost.localdomain ([9.77.176.75]) by d23av01.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r26ETR3u026877; Thu, 7 Mar 2013 01:29:28 +1100 From: Lei Li To: qemu-devel@nongnu.org Date: Wed, 6 Mar 2013 22:29:16 +0800 Message-Id: <1362580156-11498-1-git-send-email-lilei@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.7.6 X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13030614-1396-0000-0000-000002A234DE X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 202.81.31.147 Cc: stefanha@gmail.com, armbru@redhat.com, Lei Li Subject: [Qemu-devel] [PATCH v2] osdep: replace setsockopt by qemu_setsockopt X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 --- Change since v1: - Use qemu_setsockopt() instead of open-coding suggested by Stefan. --- util/osdep.c | 4 ++-- 1 files 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)