Commit 9589927 (x86/mb2: avoid Xen image when looking for
module/crashkernel position) fixed relocation issues for
Multiboot2 protocol. Unfortunately it missed to allocate
module slot for Xen image placement in early boot path.
So, let's fix it right now.
Reported-by: Wei Liu <wei.l...@citrix.com>
Signed-off-by: Daniel Kiper <daniel.ki...@oracle.com>
---
xen/arch/x86/boot/reloc.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/xen/arch/x86/boot/reloc.c b/xen/arch/x86/boot/reloc.c
index a56ec77..4f4039b 100644
--- a/xen/arch/x86/boot/reloc.c
+++ b/xen/arch/x86/boot/reloc.c
@@ -177,7 +177,12 @@ static multiboot_info_t *mbi2_reloc(u32 mbi_in)
if ( mbi_out->mods_count )
{
mbi_out->flags |= MBI_MODULES;
- mbi_out->mods_addr = alloc_mem(mbi_out->mods_count *
sizeof(*mbi_out_mods));
+ /*
+ * We have to allocate one more module slot here. At some point
+ * __start_xen() may put Xen image placement into it.
+ */
+ mbi_out->mods_addr = alloc_mem((mbi_out->mods_count + 1) *
+ sizeof(*mbi_out_mods));
mbi_out_mods = _p(mbi_out->mods_addr);
}
--
1.7.10.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
