From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753228AbbCaH0G (ORCPT ); Tue, 31 Mar 2015 03:26:06 -0400 Received: from e06smtp10.uk.ibm.com ([195.75.94.106]:32825 "EHLO e06smtp10.uk.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753024AbbCaHZx (ORCPT ); Tue, 31 Mar 2015 03:25:53 -0400 Date: Tue, 31 Mar 2015 09:25:45 +0200 From: Michael Mueller To: Christian Borntraeger Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org, linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org, Eduardo Habkost , Gleb Natapov , Alexander Graf , "Jason J. Herne" , Cornelia Huck , Paolo Bonzini , Andreas Faerber , Richard Henderson , Daniel Hansel Subject: Re: [PATCH v4 07/15] target-s390x: Update linux-headers/asm-s390/kvm.h Message-ID: <20150331092545.2139b79a@bee> In-Reply-To: <5519A5B6.9090803@de.ibm.com> References: <1427725708-52100-1-git-send-email-mimu@linux.vnet.ibm.com> <1427725708-52100-8-git-send-email-mimu@linux.vnet.ibm.com> <5519A5B6.9090803@de.ibm.com> Organization: IBM X-Mailer: Claws Mail 3.9.3 (GTK+ 2.24.23; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15033107-0041-0000-0000-000003C34059 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 30 Mar 2015 21:36:22 +0200 Christian Borntraeger wrote: > 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. 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 */ > > > From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38632) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YcqYg-0001V0-09 for qemu-devel@nongnu.org; Tue, 31 Mar 2015 03:25:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YcqYZ-0002cb-JJ for qemu-devel@nongnu.org; Tue, 31 Mar 2015 03:25:57 -0400 Received: from e06smtp11.uk.ibm.com ([195.75.94.107]:60125) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YcqYZ-0002cN-9t for qemu-devel@nongnu.org; Tue, 31 Mar 2015 03:25:51 -0400 Received: from /spool/local by e06smtp11.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 31 Mar 2015 08:25:49 +0100 Received: from b06cxnps4075.portsmouth.uk.ibm.com (d06relay12.portsmouth.uk.ibm.com [9.149.109.197]) by d06dlp02.portsmouth.uk.ibm.com (Postfix) with ESMTP id F3C412190072 for ; Tue, 31 Mar 2015 08:25:35 +0100 (BST) Received: from d06av11.portsmouth.uk.ibm.com (d06av11.portsmouth.uk.ibm.com [9.149.37.252]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t2V7Pmmc9306384 for ; Tue, 31 Mar 2015 07:25:48 GMT Received: from d06av11.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av11.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t2V7Plbd006742 for ; Tue, 31 Mar 2015 01:25:48 -0600 Date: Tue, 31 Mar 2015 09:25:45 +0200 From: Michael Mueller Message-ID: <20150331092545.2139b79a@bee> In-Reply-To: <5519A5B6.9090803@de.ibm.com> References: <1427725708-52100-1-git-send-email-mimu@linux.vnet.ibm.com> <1427725708-52100-8-git-send-email-mimu@linux.vnet.ibm.com> <5519A5B6.9090803@de.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII 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: Christian Borntraeger Cc: linux-s390@vger.kernel.org, Eduardo Habkost , kvm@vger.kernel.org, Gleb Natapov , qemu-devel@nongnu.org, linux-kernel@vger.kernel.org, Daniel Hansel , Alexander Graf , "Jason J. Herne" , Cornelia Huck , Paolo Bonzini , Andreas Faerber , Richard Henderson On Mon, 30 Mar 2015 21:36:22 +0200 Christian Borntraeger wrote: > 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. 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 */ > > >