[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 16/17] exec: Fix broken build for MinGW (regression)
From: |
Michael Tokarev |
Subject: |
[Qemu-devel] [PULL 16/17] exec: Fix broken build for MinGW (regression) |
Date: |
Fri, 20 Sep 2013 20:58:15 +0400 |
From: Stefan Weil <address@hidden>
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 <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
exec.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/exec.c b/exec.c
index 2646912..efeca14 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);
}
--
1.7.10.4
- [Qemu-devel] [PULL 00/17] Trivial patches for 2013-09-20, Michael Tokarev, 2013/09/20
- [Qemu-devel] [PULL 01/17] configure: Undefine _FORTIFY_SOURCE prior using it, Michael Tokarev, 2013/09/20
- [Qemu-devel] [PULL 03/17] docs: Fix IO port number for CPU present bitmap., Michael Tokarev, 2013/09/20
- [Qemu-devel] [PULL 12/17] target-i386: Fix segment cache dump, Michael Tokarev, 2013/09/20
- [Qemu-devel] [PULL 13/17] Makefile: Remove some more files when cleaning, Michael Tokarev, 2013/09/20
- [Qemu-devel] [PULL 16/17] exec: Fix broken build for MinGW (regression),
Michael Tokarev <=
- [Qemu-devel] [PULL 09/17] trace-events: Clean up with scripts/cleanup-trace-events.pl again, Michael Tokarev, 2013/09/20
- [Qemu-devel] [PULL 06/17] MAINTAINERS: Add missing entry to filelist for TCI target, Michael Tokarev, 2013/09/20
- [Qemu-devel] [PULL 05/17] translate-all: Fix formatting of dump output, Michael Tokarev, 2013/09/20
- [Qemu-devel] [PULL 02/17] q35: Fix typo in constant DEFUALT -> DEFAULT., Michael Tokarev, 2013/09/20
- [Qemu-devel] [PULL 04/17] *-user: Fix typo in comment (ulocking -> unlocking), Michael Tokarev, 2013/09/20
- [Qemu-devel] [PULL 11/17] iov: avoid "orig_len may be used unitialized" warning, Michael Tokarev, 2013/09/20
- [Qemu-devel] [PULL 14/17] tcg-sparc: Fix parenthesis warning, Michael Tokarev, 2013/09/20
- [Qemu-devel] [PULL 17/17] tests/.gitignore: ignore test-throttle, Michael Tokarev, 2013/09/20
- [Qemu-devel] [PULL 08/17] tci: Fix qemu-alpha on 32 bit hosts (wrong assertions), Michael Tokarev, 2013/09/20
- [Qemu-devel] [PULL 10/17] vscclient: remove unnecessary use of uninitialized variable, Michael Tokarev, 2013/09/20