From 37db817c03865511a9780667e0ea19532a19b900 Mon Sep 17 00:00:00 2001 From: Binbin Wu Date: Tue, 15 May 2018 18:24:26 +0800 Subject: [PATCH] dm: switch to 32bit kernel entry For the platform without virtual bootloader, dm will load uos kernel directly, and hv will set rip according to uos kernel entry. In current code, uos bsp starts from 64bit mode, so 64bit kernel entry is used. This patch series sets uos bsp to protected mode on such platform, so 32bit kernel entry is choosed. Signed-off-by: Binbin Wu Reviewed-by: Eddie Dong Reviewed-by: Kevin Tian Acked-by: Xu, Anthony --- devicemodel/core/sw_load_bzimage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devicemodel/core/sw_load_bzimage.c b/devicemodel/core/sw_load_bzimage.c index 02ca70adc..3b2575584 100644 --- a/devicemodel/core/sw_load_bzimage.c +++ b/devicemodel/core/sw_load_bzimage.c @@ -314,7 +314,7 @@ acrn_sw_load_bzimage(struct vmctx *ctx) if (setup_size <= 0) return -1; *kernel_entry_addr = (uint64_t) - (KERNEL_LOAD_OFF(ctx) + setup_size + 0x200); + (KERNEL_LOAD_OFF(ctx) + setup_size); ret = acrn_prepare_zeropage(ctx, setup_size); if (ret) return ret;