lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Tue, 31 Mar 2015 09:25:45 +0200 From: Michael Mueller <mimu@...ux.vnet.ibm.com> To: Christian Borntraeger <borntraeger@...ibm.com> Cc: qemu-devel@...gnu.org, kvm@...r.kernel.org, linux-s390@...r.kernel.org, linux-kernel@...r.kernel.org, Eduardo Habkost <ehabkost@...hat.com>, Gleb Natapov <gleb@...nel.org>, Alexander Graf <agraf@...e.de>, "Jason J. Herne" <jjherne@...ux.vnet.ibm.com>, Cornelia Huck <cornelia.huck@...ibm.com>, Paolo Bonzini <pbonzini@...hat.com>, Andreas Faerber <afaerber@...e.de>, Richard Henderson <rth@...ddle.net>, Daniel Hansel <daniel.hansel@...ux.vnet.ibm.com> Subject: Re: [PATCH v4 07/15] target-s390x: Update linux-headers/asm-s390/kvm.h On Mon, 30 Mar 2015 21:36:22 +0200 Christian Borntraeger <borntraeger@...ibm.com> wrote: > Am 30.03.2015 um 16:28 schrieb Michael Mueller: > > Signed-off-by: Michael Mueller <mimu@...ux.vnet.ibm.com> > > --- > > linux-headers/asm-s390/kvm.h | 18 +++++++++--------- > > 1 file changed, 9 insertions(+), 9 deletions(-) > > > > Looks like a leftover. Drop that patch and rename ibc_range to ibc in the other patch. Will drop the patch and stay with the current name used upstream already. > > > > 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 */ > > > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists