OrgACRN
/
acrn-hypervisor
mirror of https://github.com/projectacrn/acrn-hypervisor.git
1
0
Fork 0
Code Issues Releases Wiki Activity

hv: fix 'Start of variable is upper case' 

variable names shall be lower-case letters.

Tracked-On: #861
Signed-off-by: Shiqing Gao <shiqing.gao@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Shiqing Gao 2018-11-08 13:49:00 +08:00 committed by lijinxia
parent d49a6f6fca
commit f65e05c5fc
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hypervisor/arch/x86/trampoline.S
View File

@ -100,7 +100,7 @@ trampoline_fixup_target:
/* Set CR3 to PML4 table address */ /* Set CR3 to PML4 table address */
movl $CPU_Boot_Page_Tables_ptr, %ebx movl $cpu_boot_page_tables_ptr, %ebx
mov (%ebx), %eax mov (%ebx), %eax
mov %eax, %cr3 mov %eax, %cr3
@ -195,14 +195,14 @@ trampoline_gdt_ptr:
/* PML4, PDPT, and PD tables initialized to map first 4 GBytes of memory */ /* PML4, PDPT, and PD tables initialized to map first 4 GBytes of memory */
.align 4 .align 4
.global CPU_Boot_Page_Tables_ptr .global cpu_boot_page_tables_ptr
CPU_Boot_Page_Tables_ptr: cpu_boot_page_tables_ptr:
.long CPU_Boot_Page_Tables_Start .long cpu_boot_page_tables_start
/*0x1000 = CPU_PAGE_SIZE*/ /*0x1000 = CPU_PAGE_SIZE*/
.align 0x1000 .align 0x1000
.global CPU_Boot_Page_Tables_Start .global cpu_boot_page_tables_start
CPU_Boot_Page_Tables_Start: cpu_boot_page_tables_start:
/* 0x3 = (PAGE_PRESENT | PAGE_RW) */ /* 0x3 = (PAGE_PRESENT | PAGE_RW) */
.quad trampoline_pdpt_addr + 0x3 .quad trampoline_pdpt_addr + 0x3
/*0x1000 = CPU_PAGE_SIZE*/ /*0x1000 = CPU_PAGE_SIZE*/

4
hypervisor/boot/include/reloc.h
View File

@ -26,8 +26,8 @@ extern uint8_t cpu_primary_start_64;
extern uint8_t trampoline_fixup_cs; extern uint8_t trampoline_fixup_cs;
extern uint8_t trampoline_fixup_ip; extern uint8_t trampoline_fixup_ip;
extern uint8_t trampoline_fixup_target; extern uint8_t trampoline_fixup_target;
extern uint8_t CPU_Boot_Page_Tables_Start; extern uint8_t cpu_boot_page_tables_start;
extern uint8_t CPU_Boot_Page_Tables_ptr; extern uint8_t cpu_boot_page_tables_ptr;
extern uint8_t trampoline_pdpt_addr; extern uint8_t trampoline_pdpt_addr;
extern uint8_t trampoline_gdt_ptr; extern uint8_t trampoline_gdt_ptr;
extern uint8_t trampoline_start64_fixup; extern uint8_t trampoline_start64_fixup;

6
hypervisor/boot/reloc.c
View File

@ -182,12 +182,10 @@ static void update_trampoline_code_refs(uint64_t dest_pa)
*(uint16_t *)(ptr) = (uint16_t)(val & 0xfU); *(uint16_t *)(ptr) = (uint16_t)(val & 0xfU);
/* Update temporary page tables */ /* Update temporary page tables */
ptr = hpa2hva(dest_pa + ptr = hpa2hva(dest_pa + trampoline_relo_addr(&cpu_boot_page_tables_ptr));
trampoline_relo_addr(&CPU_Boot_Page_Tables_ptr));
*(uint32_t *)(ptr) += (uint32_t)dest_pa; *(uint32_t *)(ptr) += (uint32_t)dest_pa;
ptr = hpa2hva(dest_pa + ptr = hpa2hva(dest_pa + trampoline_relo_addr(&cpu_boot_page_tables_start));
trampoline_relo_addr(&CPU_Boot_Page_Tables_Start));
*(uint64_t *)(ptr) += dest_pa; *(uint64_t *)(ptr) += dest_pa;
ptr = hpa2hva(dest_pa + trampoline_relo_addr(&trampoline_pdpt_addr)); ptr = hpa2hva(dest_pa + trampoline_relo_addr(&trampoline_pdpt_addr));