Signed-off-by: Michael Mueller <mimu@xxxxxxxxxxxxxxxxxx> --- linux-headers/asm-s390/kvm.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/linux-headers/asm-s390/kvm.h b/linux-headers/asm-s390/kvm.h index c5a93eb..bfe6925 100644 --- a/linux-headers/asm-s390/kvm.h +++ b/linux-headers/asm-s390/kvm.h @@ -70,8 +70,14 @@ struct kvm_s390_io_adapter_req { #define KVM_S390_VM_TOD_LOW 0 #define KVM_S390_VM_TOD_HIGH 1 +/* kvm attributes for crypto */ +#define KVM_S390_VM_CRYPTO_ENABLE_AES_KW 0 +#define KVM_S390_VM_CRYPTO_ENABLE_DEA_KW 1 +#define KVM_S390_VM_CRYPTO_DISABLE_AES_KW 2 +#define KVM_S390_VM_CRYPTO_DISABLE_DEA_KW 3 + /* kvm attributes for KVM_S390_VM_CPU_MODEL */ -/* processor related attributes are r/w */ +/* kvm S390 processor related attributes are r/w */ #define KVM_S390_VM_CPU_PROCESSOR 0 struct kvm_s390_vm_cpu_processor { __u64 cpuid; @@ -80,22 +86,16 @@ struct kvm_s390_vm_cpu_processor { __u64 fac_list[256]; }; -/* machine related attributes are r/o */ +/* kvm S390 machine related attributes are r/o */ #define KVM_S390_VM_CPU_MACHINE 1 struct kvm_s390_vm_cpu_machine { __u64 cpuid; - __u32 ibc; + __u32 ibc_range; __u8 pad[4]; __u64 fac_mask[256]; __u64 fac_list[256]; }; -/* kvm attributes for crypto */ -#define KVM_S390_VM_CRYPTO_ENABLE_AES_KW 0 -#define KVM_S390_VM_CRYPTO_ENABLE_DEA_KW 1 -#define KVM_S390_VM_CRYPTO_DISABLE_AES_KW 2 -#define KVM_S390_VM_CRYPTO_DISABLE_DEA_KW 3 - /* for KVM_GET_REGS and KVM_SET_REGS */ struct kvm_regs { /* general purpose regs for s390 */ -- 1.8.3.1 -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html