Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb142eb7 authored by Gleb Natapov's avatar Gleb Natapov Committed by Avi Kivity
Browse files

KVM: Update cr8 intercept when APIC TPR is changed by userspace 



Since on vcpu entry we do it only if apic is enabled we should do
it when TPR is changed while apic is disabled. This happens when windows
resets HW without setting TPR to zero.

Signed-off-by: default avatarGleb Natapov <gleb@redhat.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 4b6e4dca

arch/x86/kvm/x86.c

+2 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ static u64 __read_mostly efer_reserved_bits = 0xfffffffffffffffeULL; 
#define VM_STAT(x) offsetof(struct kvm, stat.x), KVM_STAT_VM

#define VCPU_STAT(x) offsetof(struct kvm_vcpu, stat.x), KVM_STAT_VCPU



static void update_cr8_intercept(struct kvm_vcpu *vcpu);

static int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid,

				    struct kvm_cpuid_entry2 __user *entries);
@@ -1629,6 +1630,7 @@ static int kvm_vcpu_ioctl_set_lapic(struct kvm_vcpu *vcpu, 
	vcpu_load(vcpu);

	memcpy(vcpu->arch.apic->regs, s->regs, sizeof *s);

	kvm_apic_post_state_restore(vcpu);

	update_cr8_intercept(vcpu);

	vcpu_put(vcpu);



	return 0;