X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=nbd.c;h=b397a5f48755e771ef9daf9c6f338c5a5fc00038;hb=93102fd6010c68320bc9a008c8cf70cb4a36d4b9;hp=77b3e169268fc94ad8d42fbc90ef458f9e213ea5;hpb=fad6cb1a565bb73f83fc0e2654489457b489e436;p=qemu

diff --git a/nbd.c b/nbd.c
index 77b3e16..b397a5f 100644
--- a/nbd.c
+++ b/nbd.c
@@ -169,7 +169,8 @@ int tcp_socket_incoming(const char *address, uint16_t port)
     memcpy(&addr.sin_addr.s_addr, &in, sizeof(in));
 
     opt = 1;
-    if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)) == -1) {
+    if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR,
+                   (const void *) &opt, sizeof(opt)) == -1) {
         goto error;
     }
 
@@ -579,7 +580,7 @@ int nbd_trip(BlockDriverState *bs, int csock, off_t size, uint64_t dev_offset,
 	if ((request.from + request.len) > size) {
 	        LOG("From: %" PRIu64 ", Len: %u, Size: %" PRIu64
 		    ", Offset: %" PRIu64 "\n",
-		     request.from, request.len, size, dev_offset);
+                    request.from, request.len, (uint64_t)size, dev_offset);
 		LOG("requested operation past EOF--bad client?");
 		errno = EINVAL;
 		return -1;