From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753355AbbC3Tgh (ORCPT ); Mon, 30 Mar 2015 15:36:37 -0400 Received: from e06smtp17.uk.ibm.com ([195.75.94.113]:51863 "EHLO e06smtp17.uk.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752886AbbC3Tgf (ORCPT ); Mon, 30 Mar 2015 15:36:35 -0400 Message-ID: <5519A5B6.9090803@de.ibm.com> Date: Mon, 30 Mar 2015 21:36:22 +0200 From: Christian Borntraeger User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.5.0 MIME-Version: 1.0 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 , "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 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 X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15033019-0029-0000-0000-000003FFEDCB Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 */ >