Skip to content

Commit ae7dcf4

Browse files
jsun26intelacrnsi
authored andcommitted
HV: fix wrong log when vlapic process init sipi
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>
1 parent 765669e commit ae7dcf4

File tree

1 file changed

+9
-10
lines changed

1 file changed

+9
-10
lines changed

hypervisor/arch/x86/guest/vlapic.c

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1181,15 +1181,14 @@ vlapic_calc_dest_lapic_pt(struct acrn_vm *vm, uint64_t *dmask, bool is_broadcast
11811181
}
11821182

11831183
static void
1184-
vlapic_process_init_sipi(struct acrn_vcpu* target_vcpu, uint32_t mode,
1185-
uint32_t icr_low, uint16_t vcpu_id)
1184+
vlapic_process_init_sipi(struct acrn_vcpu* target_vcpu, uint32_t mode, uint32_t icr_low)
11861185
{
11871186
if (mode == APIC_DELMODE_INIT) {
11881187
if ((icr_low & APIC_LEVEL_MASK) != APIC_LEVEL_DEASSERT) {
11891188

11901189
dev_dbg(ACRN_DBG_LAPIC,
1191-
"Sending INIT from VCPU %hu to %hu",
1192-
target_vcpu->vcpu_id, vcpu_id);
1190+
"Sending INIT to %hu",
1191+
target_vcpu->vcpu_id);
11931192

11941193
/* put target vcpu to INIT state and wait for SIPI */
11951194
pause_vcpu(target_vcpu, VCPU_PAUSED);
@@ -1206,8 +1205,8 @@ vlapic_process_init_sipi(struct acrn_vcpu* target_vcpu, uint32_t mode,
12061205
(target_vcpu->arch.nr_sipi != 0U)) {
12071206

12081207
dev_dbg(ACRN_DBG_LAPIC,
1209-
"Sending SIPI from VCPU %hu to %hu with vector %u",
1210-
target_vcpu->vcpu_id, vcpu_id,
1208+
"Sending SIPI to %hu with vector %u",
1209+
target_vcpu->vcpu_id,
12111210
(icr_low & APIC_VECTOR_MASK));
12121211

12131212
target_vcpu->arch.nr_sipi--;
@@ -1302,9 +1301,9 @@ static void vlapic_icrlo_write_handler(struct acrn_vlapic *vlapic)
13021301
dev_dbg(ACRN_DBG_LAPIC,
13031302
"vlapic send ipi nmi to vcpu_id %hu", vcpu_id);
13041303
} else if (mode == APIC_DELMODE_INIT) {
1305-
vlapic_process_init_sipi(target_vcpu, mode, icr_low, vcpu_id);
1304+
vlapic_process_init_sipi(target_vcpu, mode, icr_low);
13061305
} else if (mode == APIC_DELMODE_STARTUP) {
1307-
vlapic_process_init_sipi(target_vcpu, mode, icr_low, vcpu_id);
1306+
vlapic_process_init_sipi(target_vcpu, mode, icr_low);
13081307
} else if (mode == APIC_DELMODE_SMI) {
13091308
pr_info("vlapic: SMI IPI do not support\n");
13101309
} else {
@@ -2023,10 +2022,10 @@ vlapic_x2apic_pt_icr_access(struct acrn_vm *vm, uint64_t val)
20232022

20242023
switch (mode) {
20252024
case APIC_DELMODE_INIT:
2026-
vlapic_process_init_sipi(target_vcpu, mode, icr_low, vcpu_id);
2025+
vlapic_process_init_sipi(target_vcpu, mode, icr_low);
20272026
break;
20282027
case APIC_DELMODE_STARTUP:
2029-
vlapic_process_init_sipi(target_vcpu, mode, icr_low, vcpu_id);
2028+
vlapic_process_init_sipi(target_vcpu, mode, icr_low);
20302029
break;
20312030
default:
20322031
/* convert the dest from virtual apic_id to physical apic_id */

0 commit comments

Comments
 (0)