tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 18f2af2d 2f727f50

+8 -3
+3 -3
arch/x86/kvm/svm.c
··· 3002 3002 u8 cr8_prev = kvm_get_cr8(&svm->vcpu); 3003 3003 /* instruction emulation calls kvm_set_cr8() */ 3004 3004 r = cr_interception(svm); 3005 - if (irqchip_in_kernel(svm->vcpu.kvm)) { 3006 - clr_cr_intercept(svm, INTERCEPT_CR8_WRITE); 3005 + if (irqchip_in_kernel(svm->vcpu.kvm)) 3007 3006 return r; 3008 - } 3009 3007 if (cr8_prev <= kvm_get_cr8(&svm->vcpu)) 3010 3008 return r; 3011 3009 kvm_run->exit_reason = KVM_EXIT_SET_TPR; ··· 3564 3566 3565 3567 if (is_guest_mode(vcpu) && (vcpu->arch.hflags & HF_VINTR_MASK)) 3566 3568 return; 3569 + 3570 + clr_cr_intercept(svm, INTERCEPT_CR8_WRITE); 3567 3571 3568 3572 if (irr == -1) 3569 3573 return;
+5
include/kvm/arm_vgic.h
··· 171 171 return 0; 172 172 } 173 173 174 + static inline int kvm_vgic_addr(struct kvm *kvm, unsigned long type, u64 *addr, bool write) 175 + { 176 + return -ENXIO; 177 + } 178 + 174 179 static inline int kvm_vgic_init(struct kvm *kvm) 175 180 { 176 181 return 0;