aboutsummaryrefslogtreecommitdiff
path: root/nbd.c
diff options
context:
space:
mode:
authorBlue Swirl <blauwirbel@gmail.com>2012-04-15 19:56:06 +0000
committerBlue Swirl <blauwirbel@gmail.com>2012-04-15 19:56:06 +0000
commite6f5d0be730a41bacb10edba19d1369ec2949486 (patch)
treeecf6fded694c4409c16d953f36d6e68aca33de12 /nbd.c
parent9444006fa6ba1d5e4079ee534a7236124b66ea77 (diff)
parent55dd9ffa70eb44f461b12c248c3df106ba8deca9 (diff)
downloadqemu-arm-e6f5d0be730a41bacb10edba19d1369ec2949486.tar.gz
Merge branch 'w64' of git://qemu.weilnetz.de/qemu
* 'w64' of git://qemu.weilnetz.de/qemu: w64: Fix time conversion for some versions of MinGW-w64 nbd: Fix compiler warning (w64) disas: Replace 'unsigned long' by 'uintptr_t' cpu-exec: Remove non-portable type cast and fix format string target-mips: Fix type cast for w64 (uintptr_t) w64: Fix type cast in os_host_main_loop_wait w64: Fix data types in softmmu*.h w64: Use uintptr_t in exec.c softmmu: Use uintptr_t for physaddr and rename it w64: Fix struct CPUTLBEntry w64: Fix definition of setjmp w32: Move defines for socket specific errors to qemu-os-win32.h w64: Use larger alignment for section with generated code w64: Fix data types in cpu-all.h, exec.c w64: Fix type casts used in some macros in cpu-all.h tcg/i386: Add support for w64 ABI tcg/i386: Use GDB JIT debugging interface only for hosts with ELF
Diffstat (limited to 'nbd.c')
-rw-r--r--nbd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/nbd.c b/nbd.c
index 567e94e27a..406e555bc6 100644
--- a/nbd.c
+++ b/nbd.c
@@ -813,7 +813,7 @@ static void nbd_trip(void *opaque)
LOG("From: %" PRIu64 ", Len: %u, Size: %" PRIu64
", Offset: %" PRIu64 "\n",
request.from, request.len,
- (uint64_t)exp->size, exp->dev_offset);
+ (uint64_t)exp->size, (uint64_t)exp->dev_offset);
LOG("requested operation past EOF--bad client?");
goto invalid_request;
}