github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-09-23 09:47:44 +00:00
Code Issues Projects Releases Wiki Activity

hv: fix 'User name starts with underscore'

Browse Source 
There are chances that names with leading underscore declared by
developers are conflict with the ones reserved for the compiler.

What this patch does:
- rename these functions/variables/macros starting with
  underscore to avoid such unintentational mistakes.
- remove gpr.h without any contents

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-09-29 15:46:27 +08:00
committed by Xie, Nanlin
parent 390861a04c
commit 4544d28ee1
27 changed files with 75 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,7 +6,7 @@
#ifndef RELOCATE_H
#define RELOCATE_H
extern void _relocate(void);
extern void relocate(void);
extern uint64_t get_hv_image_delta(void);
extern uint64_t get_hv_image_base(void);
extern uint64_t read_trampoline_sym(void *sym);
@@ -15,10 +15,10 @@ extern uint64_t prepare_trampoline(void);
/* external symbols that are helpful for relocation */
extern uint8_t _DYNAMIC[1];
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 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 cpu_primary_start_32;
extern uint8_t cpu_primary_start_64;

8
hypervisor/boot/reloc.c
View File

@@ -70,7 +70,7 @@ static uint64_t trampoline_relo_addr(void *addr)
return (uint64_t)addr - get_hv_image_delta();
}
void _relocate(void)
void relocate(void)
{
#ifdef CONFIG_RELOC
struct Elf64_Dyn *dyn;
@@ -108,7 +108,7 @@ void _relocate(void)
* Need to subtract the relocation delta to get the correct
* absolute addresses
*/
trampoline_end = (uint64_t)(&_ld_trampoline_end) - delta;
trampoline_end = (uint64_t)(&ld_trampoline_end) - delta;
primary_32_start = (uint64_t)(&cpu_primary_start_32) - delta;
primary_32_end = (uint64_t)(&cpu_primary_start_64) - delta;
@@ -214,7 +214,7 @@ uint64_t prepare_trampoline(void)
{
uint64_t size, dest_pa;
size = (uint64_t)(&_ld_trampoline_end - &_ld_trampoline_start);
size = (uint64_t)(&ld_trampoline_end - &ld_trampoline_start);
#ifndef CONFIG_EFI_STUB
dest_pa = e820_alloc_low_memory(CONFIG_LOW_RAM_SIZE);
#else
@@ -224,7 +224,7 @@ uint64_t prepare_trampoline(void)
pr_dbg("trampoline code: %llx size %x", dest_pa, size);
/* Copy segment for AP initialization code below 1MB */
(void)memcpy_s(hpa2hva(dest_pa), (size_t)size, &_ld_trampoline_load,
(void)memcpy_s(hpa2hva(dest_pa), (size_t)size, &ld_trampoline_load,
(size_t)size);
update_trampoline_code_refs(dest_pa);
trampoline_start16_paddr = dest_pa;