Merge tag 'kvm-riscv-6.16-1' of https://github.com/kvm-riscv/linux into HEAD
authorPaolo Bonzini <pbonzini@redhat.com>
Mon, 26 May 2025 20:27:00 +0000 (16:27 -0400)
committerPaolo Bonzini <pbonzini@redhat.com>
Mon, 26 May 2025 20:27:00 +0000 (16:27 -0400)
KVM/riscv changes for 6.16

- Add vector registers to get-reg-list selftest
- VCPU reset related improvements
- Remove scounteren initialization from VCPU reset
- Support VCPU reset from userspace using set_mpstate() ioctl

1  2 
Documentation/virt/kvm/api.rst
include/uapi/linux/kvm.h

Simple merge
index e6ed559d9091048fd8e79721eb5eaa5ccecd43f2,454b7d4a0448193eaf432045843934ddabe7136d..d00b85cb168c30f7f124a5b6470f9818ce2b7df4
@@@ -931,8 -930,7 +931,9 @@@ struct kvm_enable_cap 
  #define KVM_CAP_X86_APIC_BUS_CYCLES_NS 237
  #define KVM_CAP_X86_GUEST_MODE 238
  #define KVM_CAP_ARM_WRITABLE_IMP_ID_REGS 239
 -#define KVM_CAP_RISCV_MP_STATE_RESET 240
 +#define KVM_CAP_ARM_EL2 240
 +#define KVM_CAP_ARM_EL2_E2H0 241
++#define KVM_CAP_RISCV_MP_STATE_RESET 242
  
  struct kvm_irq_routing_irqchip {
        __u32 irqchip;