From patchwork Sun Sep 23 10:00:19 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 186192 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 BB3E92C0096 for ; Sun, 23 Sep 2012 20:01:57 +1000 (EST) Received: from localhost ([::1]:47894 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TFj0d-0006H4-W6 for incoming@patchwork.ozlabs.org; Sun, 23 Sep 2012 06:01:55 -0400 Received: from eggs.gnu.org ([208.118.235.92]:59984) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TFizc-0004hV-JC for qemu-devel@nongnu.org; Sun, 23 Sep 2012 06:00:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TFiza-0007kM-FO for qemu-devel@nongnu.org; Sun, 23 Sep 2012 06:00:52 -0400 Received: from mail-wi0-f181.google.com ([209.85.212.181]:56983) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TFiza-0007dj-96 for qemu-devel@nongnu.org; Sun, 23 Sep 2012 06:00:50 -0400 Received: by mail-wi0-f181.google.com with SMTP id hq12so116677wib.10 for ; Sun, 23 Sep 2012 03:00:49 -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 :mime-version:content-type:content-transfer-encoding; bh=UhhS+dMBNDMrhhZbSAYNBqL2wKkkCV3vjKJXjmMEKXQ=; b=LN7Q3VupDPhIflFJpJVIV5KGS8hkyfAIV+HT6eDJ9AVZihok/1+VQnh4sKgRoivKxq QPH9dhAZLNH4jWSANudF5uQ92NJA0aK5niPtKgyUaakDOTBNmd7rRfHKiroym30fBNaA Aw+rsRo5jLQbSWRIiYHc4gR5ISxY7Unjsu9kh7PjjHsmxOi6RBkeI3PLay4lypP83/dL lO4p3S/YGauI+DvRaESRStwv/W0uPnIqTdNXSkZW8nP8DQFczV62v6EN/yE7xEvfTpfe xY5fVrsAb5DoRxQkFzDKj4M83fzv8oF/oRL9hgZwvNmk87KQUJJELXiHnSrTU6e6tBAC uGqQ== Received: by 10.180.81.38 with SMTP id w6mr7606609wix.10.1348394449838; Sun, 23 Sep 2012 03:00:49 -0700 (PDT) Received: from localhost ([109.224.133.37]) by mx.google.com with ESMTPS id l6sm8307762wiz.4.2012.09.23.03.00.48 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 23 Sep 2012 03:00:49 -0700 (PDT) From: Stefan Hajnoczi To: Anthony Liguori Date: Sun, 23 Sep 2012 11:00:19 +0100 Message-Id: <1348394420-28298-14-git-send-email-stefanha@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1348394420-28298-1-git-send-email-stefanha@gmail.com> References: <1348394420-28298-1-git-send-email-stefanha@gmail.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.212.181 Cc: Stefan Weil , qemu-devel@nongnu.org, Stefan Hajnoczi Subject: [Qemu-devel] [PATCH 13/14] net/socket: 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 Commit 213fd5087e2e4e2da10ad266df0ba950cf7618bf removed a type cast which is needed for MinGW: net/socket.c:136: warning: pointer targets in passing argument 2 of ‘sendto’ differ in signedness /usr/lib/gcc/amd64-mingw32msvc/4.4.4/../../../../amd64-mingw32msvc/include/winsock2.h:1313: note: expected ‘const char *’ but argument is of type ‘const uint8_t *’ Add a 'qemu_sendto' macro which provides that type cast where needed and use the new macro instead of 'sendto'. Signed-off-by: Stefan Weil Signed-off-by: Stefan Hajnoczi --- net/socket.c | 6 +++--- qemu-common.h | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/net/socket.c b/net/socket.c index 5e0c92e..f3d7878 100644 --- a/net/socket.c +++ b/net/socket.c @@ -131,9 +131,9 @@ static ssize_t net_socket_receive_dgram(NetClientState *nc, const uint8_t *buf, ssize_t ret; do { - ret = sendto(s->fd, buf, size, 0, - (struct sockaddr *)&s->dgram_dst, - sizeof(s->dgram_dst)); + ret = qemu_sendto(s->fd, buf, size, 0, + (struct sockaddr *)&s->dgram_dst, + sizeof(s->dgram_dst)); } while (ret == -1 && errno == EINTR); if (ret == -1 && errno == EAGAIN) { diff --git a/qemu-common.h b/qemu-common.h index e5c2bcd..15d9e4e 100644 --- a/qemu-common.h +++ b/qemu-common.h @@ -223,9 +223,14 @@ int qemu_pipe(int pipefd[2]); #endif #ifdef _WIN32 +/* MinGW needs a type cast for the 'buf' argument. */ #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_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) #endif /* Error handling. */