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

HV: fix wrong log when vlapic process init sipi

Browse Source 
The print message of source and target vcpu id is incorrect, fix it.

Tracked-On: #3214

Signed-off-by: Victor Sun <victor.sun@intel.com>
Reviewed-by: Jason Chen CJ <jason.cj.chen@intel.com>
This commit is contained in:
Victor Sun 2019-06-01 10:49:03 +08:00 committed by ACRN System Integration
parent 765669ee35
commit ae7dcf443d
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1181,15 +1181,14 @@ vlapic_calc_dest_lapic_pt(struct acrn_vm *vm, uint64_t *dmask, bool is_broadcast
} }
static void static void
vlapic_process_init_sipi(struct acrn_vcpu* target_vcpu, uint32_t mode, vlapic_process_init_sipi(struct acrn_vcpu* target_vcpu, uint32_t mode, uint32_t icr_low)
uint32_t icr_low, uint16_t vcpu_id)
{ {
if (mode == APIC_DELMODE_INIT) { if (mode == APIC_DELMODE_INIT) {
if ((icr_low & APIC_LEVEL_MASK) != APIC_LEVEL_DEASSERT) { if ((icr_low & APIC_LEVEL_MASK) != APIC_LEVEL_DEASSERT) {
dev_dbg(ACRN_DBG_LAPIC, dev_dbg(ACRN_DBG_LAPIC,
"Sending INIT from VCPU %hu to %hu", "Sending INIT to %hu",
target_vcpu->vcpu_id, vcpu_id); target_vcpu->vcpu_id);
/* put target vcpu to INIT state and wait for SIPI */ /* put target vcpu to INIT state and wait for SIPI */
pause_vcpu(target_vcpu, VCPU_PAUSED); pause_vcpu(target_vcpu, VCPU_PAUSED);
@ -1206,8 +1205,8 @@ vlapic_process_init_sipi(struct acrn_vcpu* target_vcpu, uint32_t mode,
(target_vcpu->arch.nr_sipi != 0U)) { (target_vcpu->arch.nr_sipi != 0U)) {
dev_dbg(ACRN_DBG_LAPIC, dev_dbg(ACRN_DBG_LAPIC,
"Sending SIPI from VCPU %hu to %hu with vector %u", "Sending SIPI to %hu with vector %u",
target_vcpu->vcpu_id, vcpu_id, target_vcpu->vcpu_id,
(icr_low & APIC_VECTOR_MASK)); (icr_low & APIC_VECTOR_MASK));
target_vcpu->arch.nr_sipi--; target_vcpu->arch.nr_sipi--;
@ -1302,9 +1301,9 @@ static void vlapic_icrlo_write_handler(struct acrn_vlapic *vlapic)
dev_dbg(ACRN_DBG_LAPIC, dev_dbg(ACRN_DBG_LAPIC,
"vlapic send ipi nmi to vcpu_id %hu", vcpu_id); "vlapic send ipi nmi to vcpu_id %hu", vcpu_id);
} else if (mode == APIC_DELMODE_INIT) { } else if (mode == APIC_DELMODE_INIT) {
vlapic_process_init_sipi(target_vcpu, mode, icr_low, vcpu_id); vlapic_process_init_sipi(target_vcpu, mode, icr_low);
} else if (mode == APIC_DELMODE_STARTUP) { } else if (mode == APIC_DELMODE_STARTUP) {
vlapic_process_init_sipi(target_vcpu, mode, icr_low, vcpu_id); vlapic_process_init_sipi(target_vcpu, mode, icr_low);
} else if (mode == APIC_DELMODE_SMI) { } else if (mode == APIC_DELMODE_SMI) {
pr_info("vlapic: SMI IPI do not support\n"); pr_info("vlapic: SMI IPI do not support\n");
} else { } else {
@ -2023,10 +2022,10 @@ vlapic_x2apic_pt_icr_access(struct acrn_vm *vm, uint64_t val)
switch (mode) { switch (mode) {
case APIC_DELMODE_INIT: case APIC_DELMODE_INIT:
vlapic_process_init_sipi(target_vcpu, mode, icr_low, vcpu_id); vlapic_process_init_sipi(target_vcpu, mode, icr_low);
break; break;
case APIC_DELMODE_STARTUP: case APIC_DELMODE_STARTUP:
vlapic_process_init_sipi(target_vcpu, mode, icr_low, vcpu_id); vlapic_process_init_sipi(target_vcpu, mode, icr_low);
break; break;
default: default:
/* convert the dest from virtual apic_id to physical apic_id */ /* convert the dest from virtual apic_id to physical apic_id */