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

Commit 18f2af2d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm 

Pull KVM fixes from Paolo Bonzini:
 "The ARM patch fixes a build breakage with randconfig.  The x86 one
  fixes Windows guests on AMD processors"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: SVM: fix cr8 intercept window
  ARM: KVM: fix non-VGIC compilation
parents 2f727f50 596f3142

arch/x86/kvm/svm.c

+3 −3
Original line number Diff line number Diff line
@@ -3002,10 +3002,8 @@ static int cr8_write_interception(struct vcpu_svm *svm) 
	u8 cr8_prev = kvm_get_cr8(&svm->vcpu);

	/* instruction emulation calls kvm_set_cr8() */

	r = cr_interception(svm);

	if (irqchip_in_kernel(svm->vcpu.kvm)) {

		clr_cr_intercept(svm, INTERCEPT_CR8_WRITE);

	if (irqchip_in_kernel(svm->vcpu.kvm))

		return r;

	}

	if (cr8_prev <= kvm_get_cr8(&svm->vcpu))

		return r;

	kvm_run->exit_reason = KVM_EXIT_SET_TPR;
@@ -3567,6 +3565,8 @@ static void update_cr8_intercept(struct kvm_vcpu *vcpu, int tpr, int irr) 
	if (is_guest_mode(vcpu) && (vcpu->arch.hflags & HF_VINTR_MASK))

		return;



	clr_cr_intercept(svm, INTERCEPT_CR8_WRITE);



	if (irr == -1)

		return;

include/kvm/arm_vgic.h

+5 −0
Original line number Diff line number Diff line
@@ -171,6 +171,11 @@ static inline int kvm_vgic_set_addr(struct kvm *kvm, unsigned long type, u64 add 
	return 0;

}



static inline int kvm_vgic_addr(struct kvm *kvm, unsigned long type, u64 *addr, bool write)

{

	return -ENXIO;

}



static inline int kvm_vgic_init(struct kvm *kvm)

{

	return 0;