From 32fccb2f43671366266c61049c73757a6dac8b67 Mon Sep 17 00:00:00 2001 From: Yonghua Huang Date: Wed, 20 Jun 2018 21:59:55 +0800 Subject: [PATCH] HV: 'vlapic_set_local_intr()' code cleanup change the argument 'cpu_id' to 'vcpu_id' Signed-off-by: Yonghua Huang --- hypervisor/arch/x86/guest/vlapic.c | 14 +++++++------- hypervisor/include/arch/x86/guest/vlapic.h | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/hypervisor/arch/x86/guest/vlapic.c b/hypervisor/arch/x86/guest/vlapic.c index 071ed0738..9a051e970 100644 --- a/hypervisor/arch/x86/guest/vlapic.c +++ b/hypervisor/arch/x86/guest/vlapic.c @@ -1758,23 +1758,23 @@ vlapic_set_intr(struct vcpu *vcpu, uint32_t vector, bool level) } int -vlapic_set_local_intr(struct vm *vm, int cpu_id, uint32_t vector) +vlapic_set_local_intr(struct vm *vm, int vcpu_id, uint32_t vector) { struct vlapic *vlapic; uint64_t dmask = 0; int error; - if (cpu_id < -1 || cpu_id >= phy_cpu_num) + if (vcpu_id < -1 || vcpu_id >= phy_cpu_num) return -EINVAL; - if (cpu_id == -1) + if (vcpu_id == -1) dmask = vm_active_cpus(vm); else - bitmap_set(cpu_id, &dmask); + bitmap_set(vcpu_id, &dmask); error = 0; - while ((cpu_id = ffs64(dmask)) >= 0) { - bitmap_clear(cpu_id, &dmask); - vlapic = vm_lapic_from_vcpu_id(vm, cpu_id); + while ((vcpu_id = ffs64(dmask)) >= 0) { + bitmap_clear(vcpu_id, &dmask); + vlapic = vm_lapic_from_vcpu_id(vm, vcpu_id); error = vlapic_trigger_lvt(vlapic, vector); if (error != 0) break; diff --git a/hypervisor/include/arch/x86/guest/vlapic.h b/hypervisor/include/arch/x86/guest/vlapic.h index 410e9faf1..36d256724 100644 --- a/hypervisor/include/arch/x86/guest/vlapic.h +++ b/hypervisor/include/arch/x86/guest/vlapic.h @@ -89,7 +89,7 @@ vlapic_intr_edge(struct vcpu *vcpu, uint32_t vector) * Triggers the LAPIC local interrupt (LVT) 'vector' on 'cpu'. 'cpu' can * be set to -1 to trigger the interrupt on all CPUs. */ -int vlapic_set_local_intr(struct vm *vm, int cpu, uint32_t vector); +int vlapic_set_local_intr(struct vm *vm, int vcpu_id, uint32_t vector); int vlapic_intr_msi(struct vm *vm, uint64_t addr, uint64_t msg);