From patchwork Mon Mar 30 14:28:20 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Mueller X-Patchwork-Id: 456210 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3C22714008F for ; Tue, 31 Mar 2015 01:34:23 +1100 (AEDT) Received: from localhost ([::1]:34318 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ycalh-0006Nr-A8 for incoming@patchwork.ozlabs.org; Mon, 30 Mar 2015 10:34:21 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59812) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YcagW-0005IE-GT for qemu-devel@nongnu.org; Mon, 30 Mar 2015 10:29:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YcagK-0006ll-3N for qemu-devel@nongnu.org; Mon, 30 Mar 2015 10:29:00 -0400 Received: from e06smtp17.uk.ibm.com ([195.75.94.113]:53925) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YcagJ-0006lY-Qs for qemu-devel@nongnu.org; Mon, 30 Mar 2015 10:28:48 -0400 Received: from /spool/local by e06smtp17.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 30 Mar 2015 15:28:46 +0100 Received: from d06dlp03.portsmouth.uk.ibm.com (9.149.20.15) by e06smtp17.uk.ibm.com (192.168.101.147) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 30 Mar 2015 15:28:44 +0100 Received: from b06cxnps4074.portsmouth.uk.ibm.com (d06relay11.portsmouth.uk.ibm.com [9.149.109.196]) by d06dlp03.portsmouth.uk.ibm.com (Postfix) with ESMTP id 23D711B08077 for ; Mon, 30 Mar 2015 15:29:12 +0100 (BST) Received: from d06av10.portsmouth.uk.ibm.com (d06av10.portsmouth.uk.ibm.com [9.149.37.251]) by b06cxnps4074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t2UESiCb10486044 for ; Mon, 30 Mar 2015 14:28:44 GMT Received: from d06av10.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av10.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t2UEShEp015191 for ; Mon, 30 Mar 2015 08:28:43 -0600 Received: from tuxmaker.boeblingen.de.ibm.com (tuxmaker.boeblingen.de.ibm.com [9.152.85.9]) by d06av10.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id t2UESdi9014992; Mon, 30 Mar 2015 08:28:43 -0600 From: Michael Mueller To: qemu-devel@nongnu.org, kvm@vger.kernel.org, linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org Date: Mon, 30 Mar 2015 16:28:20 +0200 Message-Id: <1427725708-52100-8-git-send-email-mimu@linux.vnet.ibm.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1427725708-52100-1-git-send-email-mimu@linux.vnet.ibm.com> References: <1427725708-52100-1-git-send-email-mimu@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15033014-0029-0000-0000-000003FF1117 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 195.75.94.113 Cc: Eduardo Habkost , Gleb Natapov , Alexander Graf , Christian Borntraeger , Daniel Hansel , "Jason J. Herne" , Cornelia Huck , Paolo Bonzini , Richard Henderson , Andreas Faerber , Michael Mueller Subject: [Qemu-devel] [PATCH v4 07/15] target-s390x: Update linux-headers/asm-s390/kvm.h X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Michael Mueller --- 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 */