diff options
| author | aiju <devnull@localhost> | 2017-06-17 19:47:04 +0000 |
|---|---|---|
| committer | aiju <devnull@localhost> | 2017-06-17 19:47:04 +0000 |
| commit | cbcd9b1d718bb827432c944620fac09847c6abc0 (patch) | |
| tree | ea9b4cc4fda34100b871662aa6401ef9c8855db1 /sys/src/cmd/vmx/ksetup.c | |
| parent | 31d14c316a73766057a02d57fd08d890a25d4783 (diff) | |
vmx: VESA support and other misc I/O improvements
Diffstat (limited to 'sys/src/cmd/vmx/ksetup.c')
| -rw-r--r-- | sys/src/cmd/vmx/ksetup.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/src/cmd/vmx/ksetup.c b/sys/src/cmd/vmx/ksetup.c index 5c3009e8b..9b8b54baf 100644 --- a/sys/src/cmd/vmx/ksetup.c +++ b/sys/src/cmd/vmx/ksetup.c @@ -221,7 +221,7 @@ elff(uchar **p, uchar *e, int sz) if(sz == -1) sz = elf64 ? 8 : 4; if(*p + sz > e){ - print("out of bounds: %p > %p", *p + sz, e); + fprint(2, "out of bounds: %p > %p", *p + sz, e); return 0; } switch(sz){ @@ -558,11 +558,12 @@ obsdargs(void) uvlong s, e; obsdstart(BOOTARG_MEMMAP); + obsdpack("vvi", (uvlong)0, (uvlong)0xa0000, BIOS_MAP_FREE); for(r = mmap; r != nil; r = r->next){ s = r->start; e = r->end; if(s < (1<<20)) s = 1<<20; - if(e <= s) continue; + if(e <= s || r->type == REGFB) continue; obsdpack("vvi", s, e - s, isusermem(r) ? BIOS_MAP_FREE : BIOS_MAP_RES); } obsdpack("vvi", 0ULL, 0ULL, BIOS_MAP_END); |