From: Paolo Bonzini <pbonzini@redhat.com>
Date: Wed, 15 Feb 2023 17:33:28 +0000 (-0500)
Subject: Merge tag 'kvm-riscv-6.3-1' of https://github.com/kvm-riscv/linux into HEAD
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=33436335e93a1788a58443fc99c5ab320ce4b9d9;p=linux.git

Merge tag 'kvm-riscv-6.3-1' of https://github.com/kvm-riscv/linux into HEAD

KVM/riscv changes for 6.3

- Fix wrong usage of PGDIR_SIZE to check page sizes
- Fix privilege mode setting in kvm_riscv_vcpu_trap_redirect()
- Redirect illegal instruction traps to guest
- SBI PMU support for guest
---

33436335e93a1788a58443fc99c5ab320ce4b9d9
diff --cc arch/riscv/include/asm/kvm_host.h
index cf24da85b13c3,b90be9a2cc245..cc7da66ee0c0b
--- a/arch/riscv/include/asm/kvm_host.h
+++ b/arch/riscv/include/asm/kvm_host.h
@@@ -228,8 -229,12 +229,11 @@@ struct kvm_vcpu_arch 
  
  	/* Don't run the VCPU (blocked) */
  	bool pause;
+ 
+ 	/* Performance monitoring context */
+ 	struct kvm_pmu pmu_context;
  };
  
 -static inline void kvm_arch_hardware_unsetup(void) {}
  static inline void kvm_arch_sync_events(struct kvm *kvm) {}
  static inline void kvm_arch_sched_in(struct kvm_vcpu *vcpu, int cpu) {}