Merge tag 'kvm-arm-for-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-queue

KVM/ARM changes for 4.3

- Full debug support for arm64
- Active state switching for timer interrupts
- Lazy FP/SIMD save/restore for arm64
- Generic ARMv8 target

1 files changed, 5 insertions, 0 deletions

diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h
index 716ad4ae4d4b..a1e08e7bbf20 100644
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@ -237,6 +237,7 @@ struct kvm_run {
                         __u32 count;
                         __u64 data_offset; /* relative to kvm_run start */
                 } io;
+                /* KVM_EXIT_DEBUG */
                 struct {
                         struct kvm_debug_exit_arch arch;
                 } debug;
@@ -285,6 +286,7 @@ struct kvm_run {
                         __u32 data;
                         __u8  is_write;
                 } dcr;
+                /* KVM_EXIT_INTERNAL_ERROR */
                 struct {
                         __u32 suberror;
                         /* Available with KVM_CAP_INTERNAL_ERROR_DATA: */
@@ -295,6 +297,7 @@ struct kvm_run {
                 struct {
                         __u64 gprs[32];
                 } osi;
+                /* KVM_EXIT_PAPR_HCALL */
                 struct {
                         __u64 nr;
                         __u64 ret;
@@ -817,6 +820,8 @@ struct kvm_ppc_smmu_info {
 #define KVM_CAP_DISABLE_QUIRKS 116
 #define KVM_CAP_X86_SMM 117
 #define KVM_CAP_MULTI_ADDRESS_SPACE 118
+#define KVM_CAP_GUEST_DEBUG_HW_BPS 119
+#define KVM_CAP_GUEST_DEBUG_HW_WPS 120
 
 #ifdef KVM_CAP_IRQ_ROUTING