From patchwork Thu Apr 30 12:40:28 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 466505 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id C657E140323 for ; Thu, 30 Apr 2015 22:41:13 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=gmail.com header.i=@gmail.com header.b=skhJ48mq; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751388AbbD3Mk5 (ORCPT ); Thu, 30 Apr 2015 08:40:57 -0400 Received: from mail-wi0-f171.google.com ([209.85.212.171]:38669 "EHLO mail-wi0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750891AbbD3Mkv (ORCPT ); Thu, 30 Apr 2015 08:40:51 -0400 Received: by wiun10 with SMTP id n10so16256365wiu.1; Thu, 30 Apr 2015 05:40:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=XpmXAnUC5Q4/mww4jsLNVub4jUkhqdHTiJ20fkDE2i0=; b=skhJ48mqJ2Y4pUzZYsdnqy3x6rgt/wY07H3huKA0LGuNUMvTbQpHcOmRLn6FwBHI+L rNcM8cu3QREFiWY2MYR/y+I0KBbAhV8iy8/duiolYsypmU8V0tpmcmrXi4M7L5//QpB5 nUSMDI1pkvc7s4pK9f3hT++kvz5Gj0VDW4bDRBWxmGZMBZoP868CZMX/moOvo4n8sxfw kDIkjk5dMS+zswgINM+HV2CR7DByFdLXZkC0bJ3/fjDDP87+XGvRZBgar31BFOG1eU++ 69/3kPrvaREEp31NGBnDgXks3Si4ZamoLx0adDeZ9wOdQh29FEdwErW27jAY7egRd5Gw h+BA== X-Received: by 10.194.236.225 with SMTP id ux1mr8363941wjc.52.1430397649832; Thu, 30 Apr 2015 05:40:49 -0700 (PDT) Received: from 640k.localdomain (dynamic-adsl-94-39-185-241.clienti.tiscali.it. [94.39.185.241]) by mx.google.com with ESMTPSA id c5sm3140952wjf.40.2015.04.30.05.40.47 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Apr 2015 05:40:48 -0700 (PDT) From: Paolo Bonzini To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: kvm-ppc@vger.kernel.org, borntraeger@de.ibm.com Subject: [PATCH] KVM: booke: use __kvm_guest_exit Date: Thu, 30 Apr 2015 14:40:28 +0200 Message-Id: <1430397628-52256-1-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 Sender: kvm-ppc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm-ppc@vger.kernel.org Signed-off-by: Paolo Bonzini Reviewed-by: Christian Borntraeger --- arch/powerpc/kvm/booke.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c index 6c1316a15a27..3872ab31c80a 100644 --- a/arch/powerpc/kvm/booke.c +++ b/arch/powerpc/kvm/booke.c @@ -1004,10 +1004,10 @@ int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu, break; } - local_irq_enable(); - trace_kvm_exit(exit_nr, vcpu); - kvm_guest_exit(); + __kvm_guest_exit(); + + local_irq_enable(); run->exit_reason = KVM_EXIT_UNKNOWN; run->ready_for_interrupt_injection = 1;