From patchwork Fri Oct 5 14:00:27 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 189494 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 C0C062C0080 for ; Sat, 6 Oct 2012 00:27:58 +1000 (EST) Received: from localhost ([::1]:44896 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TK8Ts-0000mM-U1 for incoming@patchwork.ozlabs.org; Fri, 05 Oct 2012 10:02:20 -0400 Received: from eggs.gnu.org ([208.118.235.92]:34232) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TK8Sj-0006aU-LE for qemu-devel@nongnu.org; Fri, 05 Oct 2012 10:01:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TK8SZ-0006S8-VM for qemu-devel@nongnu.org; Fri, 05 Oct 2012 10:01:09 -0400 Received: from mail-bk0-f45.google.com ([209.85.214.45]:44818) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TK8SZ-0006HH-Na for qemu-devel@nongnu.org; Fri, 05 Oct 2012 10:00:59 -0400 Received: by mail-bk0-f45.google.com with SMTP id jf3so815270bkc.4 for ; Fri, 05 Oct 2012 07:00:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=U11XOwZLFBoI23vlqzBN1reuZG4xUu3bjNCtSwhgg8Q=; b=cy3iebeKkGZVbEtC1OS5T6XfrWjE+N+ilfZS0nqU7ncs8/dhHdt72uRMB9lNQMA28L ufMzmmcAc34BBsF8M54YsHCrYv0kYU/zxAT0Y0tKc3KVha/MSd0NMGlh0h45HB4Ln/As L/NeXOF4ZQWboSZD7HxhlZsSlRaq7X1eEDQf/K80Z1y6AW4sm4RIV98RYilV0MAT1jj1 Ffpu6Epx3WtpTorvf0gXKmmTaX9zoZnKnjv8SRstLt6Vy3L0zds2r24z9DJt4Rk+cWFH wTR/tX3cHdrbrrGmnJ7OV2Q4d3iBlk0ERSaFns9tKV29Unv7tAyyz6mOJeVgF3fAKTF3 Am6A== Received: by 10.204.11.209 with SMTP id u17mr2929603bku.76.1349445659215; Fri, 05 Oct 2012 07:00:59 -0700 (PDT) Received: from localhost (188-194-152-192-dynip.superkabel.de. [188.194.152.192]) by mx.google.com with ESMTPS id ht18sm3078331bkc.14.2012.10.05.07.00.58 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 05 Oct 2012 07:00:58 -0700 (PDT) From: Stefan Hajnoczi To: Anthony Liguori Date: Fri, 5 Oct 2012 16:00:27 +0200 Message-Id: <1349445632-23674-8-git-send-email-stefanha@gmail.com> X-Mailer: git-send-email 1.7.11.4 In-Reply-To: <1349445632-23674-1-git-send-email-stefanha@gmail.com> References: <1349445632-23674-1-git-send-email-stefanha@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.214.45 Cc: Stefan Weil , qemu-devel@nongnu.org, Stefan Hajnoczi Subject: [Qemu-devel] [PATCH 07/12] qemu-sockets: Fix compiler warning (regression for MinGW) 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 From: Stefan Weil setsockopt needs a type cast for MinGW. That type cast is missing in a recent commit which results in a compiler warning. Like for other socket related functions which have the same problem, we add a 'qemu_setsockopt' macro which provides that type cast where needed and use the new macro to avoid the warning. A 'qemu_getsockopt' is also added and can be used for future modifications. Signed-off-by: Stefan Weil Signed-off-by: Stefan Hajnoczi --- qemu-common.h | 10 +++++++++- qemu-sockets.c | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/qemu-common.h b/qemu-common.h index 15d9e4e..b54612b 100644 --- a/qemu-common.h +++ b/qemu-common.h @@ -223,11 +223,19 @@ int qemu_pipe(int pipefd[2]); #endif #ifdef _WIN32 -/* MinGW needs a type cast for the 'buf' argument. */ +/* MinGW needs type casts for the 'buf' and 'optval' arguments. */ +#define qemu_getsockopt(sockfd, level, optname, optval, optlen) \ + getsockopt(sockfd, level, optname, (void *)optval, optlen) +#define qemu_setsockopt(sockfd, level, optname, optval, optlen) \ + setsockopt(sockfd, level, optname, (const void *)optval, optlen) #define qemu_recv(sockfd, buf, len, flags) recv(sockfd, (void *)buf, len, flags) #define qemu_sendto(sockfd, buf, len, flags, destaddr, addrlen) \ sendto(sockfd, (const void *)buf, len, flags, destaddr, addrlen) #else +#define qemu_getsockopt(sockfd, level, optname, optval, optlen) \ + getsockopt(sockfd, level, optname, optval, optlen) +#define qemu_setsockopt(sockfd, level, optname, optval, optlen) \ + setsockopt(sockfd, level, optname, optval, optlen) #define qemu_recv(sockfd, buf, len, flags) recv(sockfd, buf, len, flags) #define qemu_sendto(sockfd, buf, len, flags, destaddr, addrlen) \ sendto(sockfd, buf, len, flags, destaddr, addrlen) diff --git a/qemu-sockets.c b/qemu-sockets.c index 1f14e8b..0f59490 100644 --- a/qemu-sockets.c +++ b/qemu-sockets.c @@ -282,7 +282,7 @@ static int inet_connect_addr(struct addrinfo *addr, bool *in_progress, inet_strfamily(addr->ai_family), strerror(errno)); return -1; } - setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)); + qemu_setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)); if (connect_state != NULL) { socket_set_nonblock(sock); }