Commit 5f0269f5 authored Aug 03, 2009 by Mikhail Ershov Committed by Avi Kivity Sep 10, 2009

KVM: Align cr8 threshold when userspace changes cr8



Commit f0a3602c20 ("KVM: Move interrupt injection logic to x86.c") does not
update the cr8 intercept if the lapic is disabled, so when userspace updates
cr8, the cr8 threshold control is not updated and we are left with illegal
control fields.

Fix by explicitly resetting the cr8 threshold.

Signed-off-by: Avi Kivity <avi@redhat.com>

parent 7f582ab6

arch/x86/kvm/x86.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -4445,6 +4445,8 @@ int kvm_arch_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu,
		kvm_set_segment(vcpu, &sregs->tr, VCPU_SREG_TR);
		kvm_set_segment(vcpu, &sregs->ldt, VCPU_SREG_LDTR);

		update_cr8_intercept(vcpu);

		/* Older userspace won't unhalt the vcpu on reset. */
		if (kvm_vcpu_is_bsp(vcpu) && kvm_rip_read(vcpu) == 0xfff0 &&
		sregs->cs.selector == 0xf000 && sregs->cs.base == 0xffff0000 &&

Admin message