Commit d348cc1e52 for qemu.org
commit d348cc1e52c8da211b7293b1e1a45cdf2a97b25a
Author: Denis V. Lunev <den@openvz.org>
Date: Tue Nov 3 19:17:01 2026 +0100
target/i386/kvm: fix latched INIT lost in kvm_put_vcpu_events()
CPU_INTERRUPT_INIT is 0x0400, while kvm_vcpu_events.smi.latched_init
is a __u8. The assignment truncates the masked value to 0, so every
KVM_SET_VCPU_EVENTS tells KVM to clear an INIT it has latched for a
vCPU in SMM. smi.pending survives only because CPU_INTERRUPT_SMI is
0x0040; normalize both with !! like the neighbouring fields.
Fixes: fc12d72e1082 ("target-i386: add support for SMBASE MSR and SMIs")
Cc: qemu-stable@nongnu.org
Signed-off-by: Denis V. Lunev <den@openvz.org>
Link: https://lore.kernel.org/r/20261103181702.832779-1-den@openvz.org
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c
index e29ecaba57..2d533d4262 100644
--- a/target/i386/kvm/kvm.c
+++ b/target/i386/kvm/kvm.c
@@ -5514,8 +5514,9 @@ static int kvm_put_vcpu_events(X86CPU *cpu, KvmPutState level)
/* As soon as these are moved to the kernel, remove them
* from cs->interrupt_request.
*/
- events.smi.pending = cs->interrupt_request & CPU_INTERRUPT_SMI;
- events.smi.latched_init = cs->interrupt_request & CPU_INTERRUPT_INIT;
+ events.smi.pending = !!(cs->interrupt_request & CPU_INTERRUPT_SMI);
+ events.smi.latched_init =
+ !!(cs->interrupt_request & CPU_INTERRUPT_INIT);
cpu_reset_interrupt(cs, CPU_INTERRUPT_INIT | CPU_INTERRUPT_SMI);
} else {
/* Keep these in cs->interrupt_request. */