From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52152) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YcfUE-0004Jn-1A for qemu-devel@nongnu.org; Mon, 30 Mar 2015 15:36:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YcfUA-0005nQ-SL for qemu-devel@nongnu.org; Mon, 30 Mar 2015 15:36:37 -0400 Received: from e06smtp14.uk.ibm.com ([195.75.94.110]:51339) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YcfUA-0005nI-Jl for qemu-devel@nongnu.org; Mon, 30 Mar 2015 15:36:34 -0400 Received: from /spool/local by e06smtp14.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 30 Mar 2015 20:36:32 +0100 Received: from b06cxnps4074.portsmouth.uk.ibm.com (d06relay11.portsmouth.uk.ibm.com [9.149.109.196]) by d06dlp01.portsmouth.uk.ibm.com (Postfix) with ESMTP id 868BC17D8042 for ; Mon, 30 Mar 2015 20:36:58 +0100 (BST) Received: from d06av02.portsmouth.uk.ibm.com (d06av02.portsmouth.uk.ibm.com [9.149.37.228]) by b06cxnps4074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t2UJaSu565536002 for ; Mon, 30 Mar 2015 19:36:28 GMT Received: from d06av02.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av02.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t2UJaOso009212 for ; Mon, 30 Mar 2015 13:36:26 -0600 Message-ID: <5519A5B6.9090803@de.ibm.com> Date: Mon, 30 Mar 2015 21:36:22 +0200 From: Christian Borntraeger MIME-Version: 1.0 References: <1427725708-52100-1-git-send-email-mimu@linux.vnet.ibm.com> <1427725708-52100-8-git-send-email-mimu@linux.vnet.ibm.com> In-Reply-To: <1427725708-52100-8-git-send-email-mimu@linux.vnet.ibm.com> Content-Type: text/plain; charset=iso-8859-15 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v4 07/15] target-s390x: Update linux-headers/asm-s390/kvm.h List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Michael Mueller , qemu-devel@nongnu.org, kvm@vger.kernel.org, linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Eduardo Habkost , Gleb Natapov , Alexander Graf , Daniel Hansel , "Jason J. Herne" , Cornelia Huck , Paolo Bonzini , Andreas Faerber , Richard Henderson Am 30.03.2015 um 16:28 schrieb Michael Mueller: > Signed-off-by: Michael Mueller > --- > 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. > 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 */ >