summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorStefan Weil <sw@weilnetz.de>2013-09-18 07:48:15 +0200
committerMichael Tokarev <mjt@tls.msk.ru>2013-09-20 20:13:09 +0400
commit089f3f761ed99bd577661e7a6335a2529eda2ba3 (patch)
tree1e16dbdc86931bd236335cd9e42009db877d5b03
parente76d05c2b5028f09f6ac6bd2beee94103f388722 (diff)
downloadfocaccia-qemu-089f3f761ed99bd577661e7a6335a2529eda2ba3.tar.gz
focaccia-qemu-089f3f761ed99bd577661e7a6335a2529eda2ba3.zip
exec: Fix broken build for MinGW (regression)
Commit 3435f39513a104294b5e3bbf3612047028d25cfc reduced the ifdeffery with
this result for MinGW:

exec.c: In function ‘qemu_ram_free’:
exec.c:1239:17: warning:
 implicit declaration of function ‘munmap’ [-Wimplicit-function-declaration]
exec.c:1239:17: warning:
 nested extern declaration of ‘munmap’ [-Wnested-externs]
exec.c:1239: undefined reference to `munmap'

Add some ifdeffery again to fix this.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
-rw-r--r--exec.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/exec.c b/exec.c
index 26469120d9..efeca147e7 100644
--- a/exec.c
+++ b/exec.c
@@ -1229,9 +1229,11 @@ void qemu_ram_free(ram_addr_t addr)
                 ;
             } else if (xen_enabled()) {
                 xen_invalidate_map_cache_entry(block->host);
+#ifndef _WIN32
             } else if (block->fd >= 0) {
                 munmap(block->host, block->length);
                 close(block->fd);
+#endif
             } else {
                 qemu_anon_ram_free(block->host, block->length);
             }