1 From 96f47b0d2c307173e0a545ea230e21f1ce8d3fa2 Mon Sep 17 00:00:00 2001
2 From: Stefan Weil <sw@weilnetz.de>
3 Date: Sat, 22 Sep 2012 21:13:28 +0200
4 Subject: [PATCH] net/socket: Fix compiler warning (regression for MinGW)
6 Content-Type: text/plain; charset=UTF-8
7 Content-Transfer-Encoding: 8bit
9 Commit 213fd5087e2e4e2da10ad266df0ba950cf7618bf removed a type cast
10 which is needed for MinGW:
12 net/socket.c:136: warning:
13 pointer targets in passing argument 2 of ‘sendto’ differ in signedness
14 /usr/lib/gcc/amd64-mingw32msvc/4.4.4/../../../../amd64-mingw32msvc/include/winsock2.h:1313: note:
15 expected ‘const char *’ but argument is of type ‘const uint8_t *’
17 Add a 'qemu_sendto' macro which provides that type cast where needed
18 and use the new macro instead of 'sendto'.
20 Signed-off-by: Stefan Weil <sw@weilnetz.de>
21 Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com>
22 (cherry picked from commit 73062dfe6be0050dbd43ce3516e935ebb2545add)
24 Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
26 net/socket.c | 6 +++---
27 qemu-common.h | 5 +++++
28 2 files changed, 8 insertions(+), 3 deletions(-)
30 diff --git a/net/socket.c b/net/socket.c
31 index c3e55b8..83f21b5 100644
34 @@ -131,9 +131,9 @@ static ssize_t net_socket_receive_dgram(NetClientState *nc, const uint8_t *buf,
38 - ret = sendto(s->fd, buf, size, 0,
39 - (struct sockaddr *)&s->dgram_dst,
40 - sizeof(s->dgram_dst));
41 + ret = qemu_sendto(s->fd, buf, size, 0,
42 + (struct sockaddr *)&s->dgram_dst,
43 + sizeof(s->dgram_dst));
44 } while (ret == -1 && errno == EINTR);
46 if (ret == -1 && errno == EAGAIN) {
47 diff --git a/qemu-common.h b/qemu-common.h
48 index e5c2bcd..15d9e4e 100644
51 @@ -223,9 +223,14 @@ int qemu_pipe(int pipefd[2]);
55 +/* MinGW needs a type cast for the 'buf' argument. */
56 #define qemu_recv(sockfd, buf, len, flags) recv(sockfd, (void *)buf, len, flags)
57 +#define qemu_sendto(sockfd, buf, len, flags, destaddr, addrlen) \
58 + sendto(sockfd, (const void *)buf, len, flags, destaddr, addrlen)
60 #define qemu_recv(sockfd, buf, len, flags) recv(sockfd, buf, len, flags)
61 +#define qemu_sendto(sockfd, buf, len, flags, destaddr, addrlen) \
62 + sendto(sockfd, buf, len, flags, destaddr, addrlen)