mirror of
https://git.freebsd.org/ports.git
synced 2025-05-14 16:21:50 -04:00
cf14e8bdd7
http://article.gmane.org/gmane.comp.emulators.qemu/267615 - Take updated bsd-user patches from sbruno's github repo. [1] - Add headers to my recent bsd-user patches. (they are applied as in the EXTRA_PATCHES order in the port Makefile) Submitted by: sbruno [1] Obtained from: https://github.com/seanbruno/qemu/commits/bsd-user [1]
28 lines
899 B
C
28 lines
899 B
C
From nox Mon Sep 17 00:00:00 2001
|
|
From: Juergen Lock <nox@jelal.kn-bremen.de>
|
|
Date: 06 Apr 2014 02:20:00 +0200
|
|
Subject: Wrap bsd-user mmap(2) allocation search to low memory
|
|
|
|
Wrap bsd-user mmap(2) allocation search to low memory to avoid
|
|
another assert on 64bit hosts.
|
|
|
|
Signed-off-by: Juergen Lock <nox@jelal.kn-bremen.de>
|
|
|
|
--- a/bsd-user/mmap.c
|
|
+++ b/bsd-user/mmap.c
|
|
@@ -238,8 +238,13 @@ abi_ulong mmap_find_vma(abi_ulong start,
|
|
for (addr1 = addr; addr1 < (addr + size); addr1 += TARGET_PAGE_SIZE) {
|
|
prot |= page_get_flags(addr1);
|
|
}
|
|
- if (prot == 0)
|
|
- break;
|
|
+ if (prot == 0) {
|
|
+ if (reserved_va && addr + size >= reserved_va) {
|
|
+ addr = 0;
|
|
+ } else {
|
|
+ break;
|
|
+ }
|
|
+ }
|
|
addr += qemu_host_page_size;
|
|
/* we found nothing */
|
|
if (addr == addr_start)
|