diff options
| author | Yang Zhong <yang.zhong@intel.com> | 2017-03-30 18:20:50 +0800 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2017-03-30 10:33:34 +0200 |
| commit | ea7d0e304775e81c07269e22b4412d328c3fb2fa (patch) | |
| tree | 569ee92e1bae2c2786e20cce007e0bd5ce69a7c3 /tables.c | |
| parent | fd8d084d31c83419500b17b4909b0ed6e8144acd (diff) | |
| download | qboot-ea7d0e304775e81c07269e22b4412d328c3fb2fa.zip qboot-ea7d0e304775e81c07269e22b4412d328c3fb2fa.tar.gz qboot-ea7d0e304775e81c07269e22b4412d328c3fb2fa.tar.bz2 | |
qboot: modified the malloc for fseg and high momory.
The fseg and high memory malloc all use the up align
mode in do_alloc(),which will result in qboot hang
issue.The high memory use the down align mode and fseg
memory use the up align mode. With those changes,the
qemu can boot up the image with qboot.
Signed-off-by: Yang Zhong <yang.zhong@intel.com>
Message-Id: <1490869250-4357-1-git-send-email-yang.zhong@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'tables.c')
| -rw-r--r-- | tables.c | 10 |
1 files changed, 4 insertions, 6 deletions
@@ -57,15 +57,13 @@ static void do_alloc(char *file, uint32_t align, uint8_t zone) if (id == -1) panic(); - if (align > 16) - n += align - 16; + if (align < 16) + align = 16; if (zone == ALLOC_FSEG) - p = malloc_fseg(n); + p = malloc_fseg_align(n, align); else - p = malloc(n); - - p = (char *)((uintptr_t)(p + align - 1) & -align); + p = malloc_align(n, align); set_file_addr(id, p); fw_cfg_read_file(id, p, n); |