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

HV: Avoiding the chained assignment

Browse Source 
To follow the Misra C standard, doing one assignment per line to
make code is clearly readable and reduces the confusion of its
intetion or typo.

Signed-off-by: Yang, Yu-chu <yu-chu.yang@intel.com>
This commit is contained in:
Yang, Yu-chu 2018-07-06 15:00:39 -07:00 committed by lijinxia
parent cfca49d7c6
commit e7aa00b83a
6 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hypervisor/arch/x86/cpuid.c
View File

@ -164,7 +164,8 @@ int set_vcpuid_entries(struct vm *vm)
result = set_vcpuid_entry(vm, &entry); result = set_vcpuid_entry(vm, &entry);
if (result != 0) if (result != 0)
return result; return result;
vm->vcpuid_level = limit = entry.eax; limit = entry.eax;
vm->vcpuid_level = limit;
for (i = 1U; i <= limit; i++) { for (i = 1U; i <= limit; i++) {
/* cpuid 1/0xb is percpu related */ /* cpuid 1/0xb is percpu related */
@ -235,7 +236,8 @@ int set_vcpuid_entries(struct vm *vm)
if (result != 0) if (result != 0)
return result; return result;
vm->vcpuid_xlevel = limit = entry.eax; limit = entry.eax;
vm->vcpuid_xlevel = limit;
for (i = 0x80000001U; i <= limit; i++) { for (i = 0x80000001U; i <= limit; i++) {
init_vcpuid_entry(vm, i, 0U, 0U, &entry); init_vcpuid_entry(vm, i, 0U, 0U, &entry);
result = set_vcpuid_entry(vm, &entry); result = set_vcpuid_entry(vm, &entry);

6
hypervisor/arch/x86/guest/ucode.c
View File

@ -49,8 +49,8 @@ void acrn_update_ucode(struct vcpu *vcpu, uint64_t v)
data_page_num = data_page_num =
(data_size + CPU_PAGE_SIZE - 1) >> CPU_PAGE_SHIFT; (data_size + CPU_PAGE_SIZE - 1) >> CPU_PAGE_SHIFT;
ptr = ucode_ptr = alloc_pages(data_page_num); ucode_ptr = alloc_pages(data_page_num);
if (ptr == NULL) if (ucode_ptr == NULL)
return; return;
err_code = 0U; err_code = 0U;
@ -62,7 +62,7 @@ void acrn_update_ucode(struct vcpu *vcpu, uint64_t v)
return; return;
msr_write(MSR_IA32_BIOS_UPDT_TRIG, msr_write(MSR_IA32_BIOS_UPDT_TRIG,
(uint64_t)ptr + sizeof(struct ucode_header)); (uint64_t)ucode_ptr + sizeof(struct ucode_header));
get_microcode_version(); get_microcode_version();
free(ucode_ptr); free(ucode_ptr);

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

@ -327,11 +327,11 @@ vioapic_write(struct vioapic *vioapic, uint32_t addr, uint32_t data)
else else
lshift = 0; lshift = 0;
last = new = vioapic->rtbl[pin].reg; last = vioapic->rtbl[pin].reg;
data64 = (uint64_t)data << lshift; data64 = (uint64_t)data << lshift;
mask64 = (uint64_t)0xffffffff << lshift; mask64 = (uint64_t)0xffffffff << lshift;
new &= ~mask64 | RTBL_RO_BITS; new = last & (~mask64 | RTBL_RO_BITS);
new |= data64 & ~RTBL_RO_BITS; new |= data64 & ~RTBL_RO_BITS;
changed = last ^ new; changed = last ^ new;

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

@ -101,7 +101,8 @@ int create_vm(struct vm_description *vm_desc, struct vm **rtn_vm)
for (id = 0U; id < (size_t)(sizeof(long) * 8U); id++) for (id = 0U; id < (size_t)(sizeof(long) * 8U); id++)
if (!bitmap_test_and_set(id, &vmid_bitmap)) if (!bitmap_test_and_set(id, &vmid_bitmap))
break; break;
vm->attr.id = vm->attr.boot_idx = id; vm->attr.id = id;
vm->attr.boot_idx = id;
atomic_store(&vm->hw.created_vcpus, 0); atomic_store(&vm->hw.created_vcpus, 0);

12
hypervisor/arch/x86/vmx.c
View File

@ -772,12 +772,20 @@ static void init_guest_state(struct vcpu *vcpu)
/***************************************************/ /***************************************************/
data32_idx = 0x10; data32_idx = 0x10;
if (vcpu_mode == CPU_MODE_REAL) { if (vcpu_mode == CPU_MODE_REAL) {
es = ss = ds = fs = gs = data32_idx; es = data32_idx;
ss = data32_idx;
ds = data32_idx;
fs = data32_idx;
gs = data32_idx;
limit = 0xffff; limit = 0xffff;
} else if (vcpu_mode == CPU_MODE_PROTECTED) { } else if (vcpu_mode == CPU_MODE_PROTECTED) {
/* Linear data segment in guest init gdt */ /* Linear data segment in guest init gdt */
es = ss = ds = fs = gs = 0x18; es = 0x18;
ss = 0x18;
ds = 0x18;
fs = 0x18;
gs = 0x18;
limit = 0xffffffffU; limit = 0xffffffffU;
} else if (vcpu_mode == CPU_MODE_64BIT) { } else if (vcpu_mode == CPU_MODE_64BIT) {
asm volatile ("movw %%es, %%ax":"=a" (es)); asm volatile ("movw %%es, %%ax":"=a" (es));

3
hypervisor/common/io_request.c
View File

@ -101,7 +101,8 @@ static void _get_req_info_(struct vhm_request *req, int *id, char *type,
char *state, char *dir, long *addr, long *val) char *state, char *dir, long *addr, long *val)
{ {
(void)strcpy_s(dir, 16, "NONE"); (void)strcpy_s(dir, 16, "NONE");
*addr = *val = 0; *addr = 0;
*val = 0;
*id = req->client; *id = req->client;
switch (req->type) { switch (req->type) {