From patchwork Fri Sep 18 13:00:31 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 48527 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n8ID0d5t022729 for ; Fri, 18 Sep 2009 13:00:39 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755930AbZIRNAd (ORCPT ); Fri, 18 Sep 2009 09:00:33 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755910AbZIRNAc (ORCPT ); Fri, 18 Sep 2009 09:00:32 -0400 Received: from cantor.suse.de ([195.135.220.2]:55662 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753705AbZIRNAa (ORCPT ); Fri, 18 Sep 2009 09:00:30 -0400 Received: from relay1.suse.de (mail2.suse.de [195.135.221.8]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.suse.de (Postfix) with ESMTP id 5748E8E8CC for ; Fri, 18 Sep 2009 15:00:33 +0200 (CEST) From: Alexander Graf To: kvm@vger.kernel.org Subject: [PATCH 4/5] Don't bail when injecting an event in nested SVM Date: Fri, 18 Sep 2009 15:00:31 +0200 Message-Id: <1253278832-31803-5-git-send-email-agraf@suse.de> X-Mailer: git-send-email 1.6.0.2 In-Reply-To: <1253278832-31803-4-git-send-email-agraf@suse.de> References: <1253278832-31803-1-git-send-email-agraf@suse.de> <1253278832-31803-2-git-send-email-agraf@suse.de> <1253278832-31803-3-git-send-email-agraf@suse.de> <1253278832-31803-4-git-send-email-agraf@suse.de> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org There's a warning to alarm the user when the guest has a valid exit_int_info, but really shouldn't have. We don't want that warning when running an L2 guest, because we're in control of the state then anyways, so let's not warn when running nested. Signed-off-by: Alexander Graf --- arch/x86/kvm/svm.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index 28fcbd0..12ec8ee 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -2404,7 +2404,8 @@ static int handle_exit(struct kvm_vcpu *vcpu) return 0; } - if (is_external_interrupt(svm->vmcb->control.exit_int_info) && + if (!is_nested(svm) && + is_external_interrupt(svm->vmcb->control.exit_int_info) && exit_code != SVM_EXIT_EXCP_BASE + PF_VECTOR && exit_code != SVM_EXIT_NPF && exit_code != SVM_EXIT_TASK_SWITCH) printk(KERN_ERR "%s: unexpected exit_ini_info 0x%x "