github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-09-21 08:50:27 +00:00
Code Issues Projects Releases Wiki Activity

hv: Fix typo of trampline with trampoline

Browse Source 
Signed-off-by: Yin Fengwei <fengwei.yin@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Yin Fengwei
2018-06-11 12:31:25 +00:00
committed by lijinxia
parent 7d13e5be1b
commit 5414d57ac4
10 changed files with 92 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
hypervisor/include/arch/x86/cpu.h
View File

@@ -156,23 +156,23 @@ int cpu_find_logical_id(uint32_t lapic_id);
/**********************************/
/* EXTERNAL VARIABLES */
/**********************************/
extern const uint8_t _ld_trampline_load[];
extern uint8_t _ld_trampline_start[];
extern uint8_t _ld_trampline_end[];
extern const uint64_t _ld_trampline_size;
extern const uint8_t _ld_trampoline_load[];
extern uint8_t _ld_trampoline_start[];
extern uint8_t _ld_trampoline_end[];
extern const uint64_t _ld_trampoline_size;
extern uint8_t _ld_bss_start[];
extern uint8_t _ld_bss_end[];
extern uint8_t trampline_fixup_cs[];
extern uint8_t trampline_fixup_ip[];
extern uint8_t trampline_fixup_target[];
extern uint8_t trampoline_fixup_cs[];
extern uint8_t trampoline_fixup_ip[];
extern uint8_t trampoline_fixup_target[];
extern uint8_t CPU_Boot_Page_Tables_Start[];
extern uint8_t CPU_Boot_Page_Tables_ptr[];
extern uint8_t trampline_pdpt_addr[];
extern uint8_t trampline_gdt_ptr[];
extern uint8_t trampline_start64_fixup[];
extern uint8_t trampoline_pdpt_addr[];
extern uint8_t trampoline_gdt_ptr[];
extern uint8_t trampoline_start64_fixup[];
extern uint64_t trampline_start16_paddr;
extern uint64_t trampoline_start16_paddr;
extern int ibrs_type;
/*
@@ -250,7 +250,7 @@ extern struct cpuinfo_x86 boot_cpu_data;
/* Function prototypes */
void cpu_dead(uint32_t logical_id);
void trampline_start16(void);
void trampoline_start16(void);
int hv_main(int cpu_id);
bool is_vapic_supported(void);
bool is_vapic_intr_delivery_supported(void);

4
hypervisor/include/common/acrn_efi.h
View File

@@ -15,7 +15,7 @@ typedef struct {
struct efi_ctx {
uint64_t rip;
void *rsdp;
void *ap_trampline_buf;
void *ap_trampoline_buf;
dt_addr_t gdt;
dt_addr_t idt;
uint16_t tr_sel;
@@ -51,6 +51,6 @@ struct efi_ctx {
}__attribute__((packed));
void *get_rsdp_from_uefi(void);
void *get_ap_trampline_buf(void);
void *get_ap_trampoline_buf(void);
#endif /* UEFI_H*/