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

KVM/riscv changes for 6.5 - Redirect AMO load/store misaligned traps to KVM guest - Trap-n-emulate AIA in-kernel irqchip for KVM guest - Svnapot support for KVM Guest

Paolo Bonzini committed 3 years ago

Commit b5396272 parents a443e26 07f225b20 files · +3100 −61Browse files

Showing the changes to include/uapi/linux (1 of 20 files). Show all

Unified · Split

include/uapi/linux/kvm.h+2−0

@@ -1442,6 +1442,8 @@ enum kvm_device_type { · 1441 unmodified lines
1442	#define KVM_DEV_TYPE_XIVE KVM_DEV_TYPE_XIVE	1442	#define KVM_DEV_TYPE_XIVE KVM_DEV_TYPE_XIVE
1443	KVM_DEV_TYPE_ARM_PV_TIME,	1443	KVM_DEV_TYPE_ARM_PV_TIME,
1444	#define KVM_DEV_TYPE_ARM_PV_TIME KVM_DEV_TYPE_ARM_PV_TIME	1444	#define KVM_DEV_TYPE_ARM_PV_TIME KVM_DEV_TYPE_ARM_PV_TIME
		1445	KVM_DEV_TYPE_RISCV_AIA,
		1446	#define KVM_DEV_TYPE_RISCV_AIA KVM_DEV_TYPE_RISCV_AIA
1445	KVM_DEV_TYPE_MAX,	1447	KVM_DEV_TYPE_MAX,
1446	};	1448	};
1447		1449