History

Merge tag 'kvm-s390-next-5.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD

KVM: s390: Fixes and cleanups for 5.6 - fix register corruption - ENOTSUPP/EOPNOTSUPP mixed - reset cleanups/fixes - selftests

Paolo Bonzini committed 6 years ago

Commit ef09f4f2 parents df7e881 b2ff7289 files · +354 −37Browse files

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

Unified · Split

include/uapi/linux/kvm.h+5−0
@@ -1009,6 +1009,7 @@ struct kvm_ppc_resize_hpt { · 1008 unmodified lines
1009#define KVM_CAP_PPC_GUEST_DEBUG_SSTEP 1761009#define KVM_CAP_PPC_GUEST_DEBUG_SSTEP 176
1010#define KVM_CAP_ARM_NISV_TO_USER 1771010#define KVM_CAP_ARM_NISV_TO_USER 177
1011#define KVM_CAP_ARM_INJECT_EXT_DABT 1781011#define KVM_CAP_ARM_INJECT_EXT_DABT 178
1012#define KVM_CAP_S390_VCPU_RESETS 179
1012 1013
1013#ifdef KVM_CAP_IRQ_ROUTING1014#ifdef KVM_CAP_IRQ_ROUTING
1014 1015
@@ -1473,6 +1474,10 @@ struct kvm_enc_region { · 458 unmodified lines
1473/* Available with KVM_CAP_ARM_SVE */1474/* Available with KVM_CAP_ARM_SVE */
1474#define KVM_ARM_VCPU_FINALIZE _IOW(KVMIO, 0xc2, int)1475#define KVM_ARM_VCPU_FINALIZE _IOW(KVMIO, 0xc2, int)
1475 1476
1477/* Available with KVM_CAP_S390_VCPU_RESETS */
1478#define KVM_S390_NORMAL_RESET _IO(KVMIO, 0xc3)
1479#define KVM_S390_CLEAR_RESET _IO(KVMIO, 0xc4)
1480
1476/* Secure Encrypted Virtualization command */1481/* Secure Encrypted Virtualization command */
1477enum sev_cmd_id {1482enum sev_cmd_id {
1478 /* Guest initialization commands */1483 /* Guest initialization commands */