stv0g/xhyve
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'mist64/master'

Browse source 
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
This commit is contained in:
Jeremy Huddleston Sequoia 2015-12-28 19:12:10 -08:00
commit 63a785dd22
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -1,4 +1,4 @@
# xhyve
# [xhyve.xyz](http://www.xhyve.xyz)
![](./xhyve_logo.png)
<!-- https://thenounproject.com/term/squirrel/57718/ -->

9
src/firmware/kexec.c
View file

@ -152,7 +152,14 @@ kexec_load_kernel(char *path, char *cmdline) {
zp->e820_map[1].addr = 0x0000000000100000;
zp->e820_map[1].size = (memory.size - 0x0000000000100000);
zp->e820_map[1].type = 1;
zp->e820_entries = 2;
if (xh_vm_get_highmem_size() == 0) {
zp->e820_entries = 2;
} else {
zp->e820_map[2].addr = 0x0000000100000000;
zp->e820_map[2].size = xh_vm_get_highmem_size();
zp->e820_map[2].type = 1;
zp->e820_entries = 3;
}
kernel.base = kernel_start;
kernel.size = kernel_init_size;