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

hv:cleanup vcpu_id compare with phys_cpu_num

Browse Source 
Currently we compare vcpu_id with phys_cpu_num,
vcpu_id is not related with phys_cpu_num,
this patch cleanup them.

Tracked-On: #861
Signed-off-by: Mingqiang Chi <mingqiang.chi@intel.com>
Reviewed-by: Li, Fei1 <fei1.li@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Mingqiang Chi 2018-10-24 12:03:57 +08:00 committed by Xie, Nanlin
parent 3eb45b9bf6
commit 4afb6666b9
3 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hypervisor/arch/x86/guest/vlapic.c
View File

@ -987,7 +987,7 @@ vlapic_calcdest(struct vm *vm, uint64_t *dmask, uint32_t dest,
*/ */
*dmask = 0UL; *dmask = 0UL;
vcpu_id = vm_apicid2vcpu_id(vm, (uint8_t)dest); vcpu_id = vm_apicid2vcpu_id(vm, (uint8_t)dest);
if (vcpu_id < phys_cpu_num) { if (vcpu_id < vm->hw.created_vcpus) {
bitmap_set_lock(vcpu_id, dmask); bitmap_set_lock(vcpu_id, dmask);
} }
} else { } else {
@ -1619,9 +1619,6 @@ vlapic_reset(struct acrn_vlapic *vlapic)
void void
vlapic_init(struct acrn_vlapic *vlapic) vlapic_init(struct acrn_vlapic *vlapic)
{ {
ASSERT(vlapic->vcpu->vcpu_id < phys_cpu_num,
"%s: vcpu_id is not initialized", __func__);
/* /*
* If the vlapic is configured in x2apic mode then it will be * If the vlapic is configured in x2apic mode then it will be
* accessed in the critical section via the MSR emulation code. * accessed in the critical section via the MSR emulation code.
@ -1848,7 +1845,7 @@ vlapic_set_local_intr(struct vm *vm, uint16_t vcpu_id_arg, uint32_t vector)
int error; int error;
uint16_t vcpu_id = vcpu_id_arg; uint16_t vcpu_id = vcpu_id_arg;
if ((vcpu_id != BROADCAST_CPU_ID) && (vcpu_id >= phys_cpu_num)) { if ((vcpu_id != BROADCAST_CPU_ID) && (vcpu_id >= vm->hw.created_vcpus)) {
return -EINVAL; return -EINVAL;
} }

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

@ -406,7 +406,7 @@ int prepare_vm0(void)
} }
/* Allocate all cpus to vm0 at the beginning */ /* Allocate all cpus to vm0 at the beginning */
for (i = 0U; i < phys_cpu_num; i++) { for (i = 0U; i < vm0_desc.vm_hw_num_cores; i++) {
err = prepare_vcpu(vm, i); err = prepare_vcpu(vm, i);
if (err != 0) { if (err != 0) {
return err; return err;

9
hypervisor/debug/shell.c
View File

@ -640,10 +640,7 @@ static int shell_vcpu_dumpreg(int argc, char **argv)
} }
vm_id = (uint16_t)status; vm_id = (uint16_t)status;
vcpu_id = (uint16_t)atoi(argv[2]); vcpu_id = (uint16_t)atoi(argv[2]);
if (vcpu_id >= phys_cpu_num) {
status = -EINVAL;
goto out;
}
vm = get_vm_from_vmid(vm_id); vm = get_vm_from_vmid(vm_id);
if (vm == NULL) { if (vm == NULL) {
shell_puts("No vm found in the input <vm_id, vcpu_id>\r\n"); shell_puts("No vm found in the input <vm_id, vcpu_id>\r\n");
@ -651,8 +648,8 @@ static int shell_vcpu_dumpreg(int argc, char **argv)
goto out; goto out;
} }
if (vcpu_id >= CONFIG_MAX_VCPUS_PER_VM) { if (vcpu_id >= vm->hw.created_vcpus) {
shell_puts("No vcpu found in the input <vm_id, vcpu_id>\r\n"); shell_puts("vcpu id is out of range\r\n");
status = -EINVAL; status = -EINVAL;
goto out; goto out;
} }