From patchwork Wed Apr 30 13:58:21 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cornelia Huck X-Patchwork-Id: 344166 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id EC30B140127 for ; Wed, 30 Apr 2014 23:59:31 +1000 (EST) Received: from localhost ([::1]:56850 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WfV2n-0006gP-My for incoming@patchwork.ozlabs.org; Wed, 30 Apr 2014 09:59:29 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45210) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WfV27-0005UY-R2 for qemu-devel@nongnu.org; Wed, 30 Apr 2014 09:58:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WfV20-0000VL-19 for qemu-devel@nongnu.org; Wed, 30 Apr 2014 09:58:47 -0400 Received: from e06smtp13.uk.ibm.com ([195.75.94.109]:51898) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WfV1z-0000VD-Od for qemu-devel@nongnu.org; Wed, 30 Apr 2014 09:58:39 -0400 Received: from /spool/local by e06smtp13.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 30 Apr 2014 14:58:38 +0100 Received: from d06dlp02.portsmouth.uk.ibm.com (9.149.20.14) by e06smtp13.uk.ibm.com (192.168.101.143) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 30 Apr 2014 14:58:36 +0100 Received: from b06cxnps3075.portsmouth.uk.ibm.com (d06relay10.portsmouth.uk.ibm.com [9.149.109.195]) by d06dlp02.portsmouth.uk.ibm.com (Postfix) with ESMTP id 9627C219004D for ; Wed, 30 Apr 2014 14:58:27 +0100 (BST) Received: from d06av12.portsmouth.uk.ibm.com (d06av12.portsmouth.uk.ibm.com [9.149.37.247]) by b06cxnps3075.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id s3UDwZuD065858 for ; Wed, 30 Apr 2014 13:58:35 GMT Received: from d06av12.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av12.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id s3UDwWsO032474 for ; Wed, 30 Apr 2014 07:58:34 -0600 Received: from gondolin.boeblingen.de.ibm.com (dyn-9-152-224-107.boeblingen.de.ibm.com [9.152.224.107]) by d06av12.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id s3UDwOjk032173; Wed, 30 Apr 2014 07:58:29 -0600 From: Cornelia Huck To: qemu-devel@nongnu.org Date: Wed, 30 Apr 2014 15:58:21 +0200 Message-Id: <1398866302-11840-3-git-send-email-cornelia.huck@de.ibm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1398866302-11840-1-git-send-email-cornelia.huck@de.ibm.com> References: <1398866302-11840-1-git-send-email-cornelia.huck@de.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 14043013-2966-0000-0000-00000B1DC223 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 195.75.94.109 Cc: Cornelia Huck , peter.maydell@linaro.org, agraf@suse.de, aliguori@amazon.com, borntraeger@de.ibm.com Subject: [Qemu-devel] [PULL 2/3] s390x: use kvm_vcpu_enable_cap() 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 Make kvm_s390_enable_css_support() use new interface. Reviewed-by: Thomas Huth Reviewed-by: Alexander Graf Signed-off-by: Cornelia Huck --- target-s390x/kvm.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c index a30d1bc..b7b0edc 100644 --- a/target-s390x/kvm.c +++ b/target-s390x/kvm.c @@ -929,12 +929,10 @@ void kvm_s390_crw_mchk(S390CPU *cpu) void kvm_s390_enable_css_support(S390CPU *cpu) { - struct kvm_enable_cap cap = {}; int r; /* Activate host kernel channel subsystem support. */ - cap.cap = KVM_CAP_S390_CSS_SUPPORT; - r = kvm_vcpu_ioctl(CPU(cpu), KVM_ENABLE_CAP, &cap); + r = kvm_vcpu_enable_cap(CPU(cpu), KVM_CAP_S390_CSS_SUPPORT, 0); assert(r == 0); }