From patchwork Thu Apr 22 10:33:10 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joerg Roedel X-Patchwork-Id: 94083 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o3MAZpAD021617 for ; Thu, 22 Apr 2010 10:40:23 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753566Ab0DVKdc (ORCPT ); Thu, 22 Apr 2010 06:33:32 -0400 Received: from tx2ehsobe001.messaging.microsoft.com ([65.55.88.11]:39641 "EHLO TX2EHSOBE001.bigfish.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753401Ab0DVKda (ORCPT ); Thu, 22 Apr 2010 06:33:30 -0400 Received: from mail118-tx2-R.bigfish.com (10.9.14.246) by TX2EHSOBE001.bigfish.com (10.9.40.21) with Microsoft SMTP Server id 8.1.340.0; Thu, 22 Apr 2010 10:33:29 +0000 Received: from mail118-tx2 (localhost.localdomain [127.0.0.1]) by mail118-tx2-R.bigfish.com (Postfix) with ESMTP id 14A5E81040F; Thu, 22 Apr 2010 10:33:30 +0000 (UTC) X-SpamScore: 11 X-BigFish: VPS11(zzab9bh9321rzz1202hzzz32i2a8h87h43h61h) X-Spam-TCS-SCL: 0:0 X-FB-DOMAIN-IP-MATCH: fail Received: from mail118-tx2 (localhost.localdomain [127.0.0.1]) by mail118-tx2 (MessageSwitch) id 1271932409875928_24285; Thu, 22 Apr 2010 10:33:29 +0000 (UTC) Received: from TX2EHSMHS038.bigfish.com (unknown [10.9.14.246]) by mail118-tx2.bigfish.com (Postfix) with ESMTP id D247D1568051; Thu, 22 Apr 2010 10:33:29 +0000 (UTC) Received: from ausb3extmailp01.amd.com (163.181.251.8) by TX2EHSMHS038.bigfish.com (10.9.99.138) with Microsoft SMTP Server (TLS) id 14.0.482.44; Thu, 22 Apr 2010 10:33:28 +0000 Received: from ausb3twp01.amd.com ([163.181.250.37]) by ausb3extmailp01.amd.com (Switch-3.2.7/Switch-3.2.7) with SMTP id o3MARMaU009612; Thu, 22 Apr 2010 05:27:25 -0500 X-WSS-ID: 0L19XBM-01-036-02 X-M-MSG: Received: from sausexhtp02.amd.com (sausexhtp02.amd.com [163.181.3.152]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (No client certificate requested) by ausb3twp01.amd.com (Tumbleweed MailGate 3.7.2) with ESMTP id 2CC4F1028A4F; Thu, 22 Apr 2010 05:33:21 -0500 (CDT) Received: from storexhtp02.amd.com (172.24.4.4) by sausexhtp02.amd.com (163.181.3.152) with Microsoft SMTP Server (TLS) id 8.2.234.1; Thu, 22 Apr 2010 05:33:24 -0500 Received: from storexbh1.amd.com (10.1.1.17) by storexhtp02.amd.com (172.24.4.4) with Microsoft SMTP Server id 8.2.234.1; Thu, 22 Apr 2010 05:33:23 -0500 Received: from sausexmb1.amd.com ([163.181.3.156]) by storexbh1.amd.com with Microsoft SMTPSVC(6.0.3790.4675); Thu, 22 Apr 2010 06:33:23 -0400 Received: from seurexmb1.amd.com ([165.204.9.130]) by sausexmb1.amd.com with Microsoft SMTPSVC(6.0.3790.3959); Thu, 22 Apr 2010 05:33:22 -0500 Received: from lemmy.osrc.amd.com ([165.204.15.93]) by seurexmb1.amd.com with Microsoft SMTPSVC(6.0.3790.4675); Thu, 22 Apr 2010 12:33:18 +0200 Received: by lemmy.osrc.amd.com (Postfix, from userid 41430) id E3D88C9B90; Thu, 22 Apr 2010 12:33:18 +0200 (CEST) From: Joerg Roedel To: Avi Kivity , Marcelo Tosatti CC: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Joerg Roedel Subject: [PATCH 4/8] KVM: SVM: Propagate nested entry failure into guest hypervisor Date: Thu, 22 Apr 2010 12:33:10 +0200 Message-ID: <1271932394-13968-5-git-send-email-joerg.roedel@amd.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1271932394-13968-1-git-send-email-joerg.roedel@amd.com> References: <1271932394-13968-1-git-send-email-joerg.roedel@amd.com> X-OriginalArrivalTime: 22 Apr 2010 10:33:19.0044 (UTC) FILETIME=[397A3840:01CAE207] MIME-Version: 1.0 X-Reverse-DNS: unknown Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Thu, 22 Apr 2010 10:40:24 +0000 (UTC) diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index 5ad9d80..b10d163 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -1715,6 +1715,10 @@ static int nested_svm_intercept(struct vcpu_svm *svm) vmexit = NESTED_EXIT_DONE; break; } + case SVM_EXIT_ERR: { + vmexit = NESTED_EXIT_DONE; + break; + } default: { u64 exit_bits = 1ULL << (exit_code - SVM_EXIT_INTR); if (svm->nested.intercept & exit_bits)