github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-27 07:46:53 +00:00
Code Issues Projects Releases Wiki Activity

HV: ve820 fix "Casting operation to a pointer"

Browse Source 
ACRN Coding guidelines requires two different types pointer can't
convert to each other, except void *.

Tracked-On: #861
Signed-off-by: Huihuang Shi <huihuang.shi@intel.com>
This commit is contained in:
Huihuang Shi 2019-07-09 11:19:14 +08:00 committed by wenlingz
parent 1aef5290ea
commit 9063504bc8
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hypervisor/arch/x86/configs/apl-mrb/ve820.c
View File

@ -46,5 +46,5 @@ static const struct e820_entry ve820_entry[VE820_ENTRIES_APL_MRB] = {
void create_prelaunched_vm_e820(struct acrn_vm *vm) void create_prelaunched_vm_e820(struct acrn_vm *vm)
{ {
vm->e820_entry_num = VE820_ENTRIES_APL_MRB; vm->e820_entry_num = VE820_ENTRIES_APL_MRB;
vm->e820_entries = (struct e820_entry *)ve820_entry; vm->e820_entries = ve820_entry;
} }

2
hypervisor/arch/x86/configs/dnv-cb2/ve820.c
View File

@ -46,5 +46,5 @@ static const struct e820_entry ve820_entry[VE820_ENTRIES_DNV_CB2] = {
void create_prelaunched_vm_e820(struct acrn_vm *vm) void create_prelaunched_vm_e820(struct acrn_vm *vm)
{ {
vm->e820_entry_num = VE820_ENTRIES_DNV_CB2; vm->e820_entry_num = VE820_ENTRIES_DNV_CB2;
vm->e820_entries = (struct e820_entry *)ve820_entry; vm->e820_entries = ve820_entry;
} }

2
hypervisor/arch/x86/configs/nuc7i7bnh/ve820.c
View File

@ -45,5 +45,5 @@ static const struct e820_entry ve820_entry[VE820_ENTRIES_KBL_NUC_i7] = {
void create_prelaunched_vm_e820(struct acrn_vm *vm) void create_prelaunched_vm_e820(struct acrn_vm *vm)
{ {
vm->e820_entry_num = VE820_ENTRIES_KBL_NUC_i7; vm->e820_entry_num = VE820_ENTRIES_KBL_NUC_i7;
vm->e820_entries = (struct e820_entry *)ve820_entry; vm->e820_entries = ve820_entry;
} }

4
hypervisor/arch/x86/guest/vm.c
View File

@ -188,7 +188,7 @@ static void prepare_prelaunched_vm_memmap(struct acrn_vm *vm, const struct acrn_
uint32_t i; uint32_t i;
for (i = 0U; i < vm->e820_entry_num; i++) { for (i = 0U; i < vm->e820_entry_num; i++) {
struct e820_entry *entry = &(vm->e820_entries[i]); const struct e820_entry *entry = &(vm->e820_entries[i]);
if (entry->length == 0UL) { if (entry->length == 0UL) {
break; break;
@ -327,7 +327,7 @@ static void prepare_sos_vm_memmap(struct acrn_vm *vm)
const struct e820_entry *entry; const struct e820_entry *entry;
uint32_t entries_count = vm->e820_entry_num; uint32_t entries_count = vm->e820_entry_num;
struct e820_entry *p_e820 = vm->e820_entries; const struct e820_entry *p_e820 = vm->e820_entries;
const struct e820_mem_params *p_e820_mem_info = get_e820_mem_info(); const struct e820_mem_params *p_e820_mem_info = get_e820_mem_info();
pr_dbg("sos_vm: bottom memory - 0x%llx, top memory - 0x%llx\n", pr_dbg("sos_vm: bottom memory - 0x%llx, top memory - 0x%llx\n",

2
hypervisor/common/vm_load.c
View File

@ -38,7 +38,7 @@ static uint32_t create_zeropage_e820(struct zero_page *zp, const struct acrn_vm
{ {
uint32_t entry_num = vm->e820_entry_num; uint32_t entry_num = vm->e820_entry_num;
struct e820_entry *zp_e820 = zp->entries; struct e820_entry *zp_e820 = zp->entries;
struct e820_entry *vm_e820 = vm->e820_entries; const struct e820_entry *vm_e820 = vm->e820_entries;
if ((zp_e820 == NULL) || (vm_e820 == NULL) || (entry_num == 0U) || (entry_num > E820_MAX_ENTRIES)) { if ((zp_e820 == NULL) || (vm_e820 == NULL) || (entry_num == 0U) || (entry_num > E820_MAX_ENTRIES)) {
pr_err("e820 create error"); pr_err("e820 create error");

2
hypervisor/include/arch/x86/guest/vm.h
View File

@ -111,7 +111,7 @@ struct acrn_vm {
struct vm_sw_info sw; /* Reference to SW associated with this VM */ struct vm_sw_info sw; /* Reference to SW associated with this VM */
struct vm_pm_info pm; /* Reference to this VM's arch information */ struct vm_pm_info pm; /* Reference to this VM's arch information */
uint32_t e820_entry_num; uint32_t e820_entry_num;
struct e820_entry *e820_entries; const struct e820_entry *e820_entries;
uint16_t vm_id; /* Virtual machine identifier */ uint16_t vm_id; /* Virtual machine identifier */
enum vm_state state; /* VM state */ enum vm_state state; /* VM state */
struct acrn_vuart vuart[MAX_VUART_NUM_PER_VM]; /* Virtual UART */ struct acrn_vuart vuart[MAX_VUART_NUM_PER_VM]; /* Virtual UART */