From patchwork Thu Jul 9 14:36:01 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joerg Roedel X-Patchwork-Id: 34818 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 n69EaQfQ020120 for ; Thu, 9 Jul 2009 14:36:26 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760251AbZGIOgY (ORCPT ); Thu, 9 Jul 2009 10:36:24 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1759207AbZGIOgY (ORCPT ); Thu, 9 Jul 2009 10:36:24 -0400 Received: from tx2ehsobe005.messaging.microsoft.com ([65.55.88.15]:19655 "EHLO TX2EHSOBE010.bigfish.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759070AbZGIOgX (ORCPT ); Thu, 9 Jul 2009 10:36:23 -0400 Received: from mail8-tx2-R.bigfish.com (10.9.14.243) by TX2EHSOBE010.bigfish.com (10.9.40.30) with Microsoft SMTP Server id 8.1.340.0; Thu, 9 Jul 2009 14:36:22 +0000 Received: from mail8-tx2 (localhost.localdomain [127.0.0.1]) by mail8-tx2-R.bigfish.com (Postfix) with ESMTP id 9A98D3A8490; Thu, 9 Jul 2009 14:36:22 +0000 (UTC) X-SpamScore: 3 X-BigFish: VPS3(zzzz1202hzzz32i43j61h) X-Spam-TCS-SCL: 0:0 Received: by mail8-tx2 (MessageSwitch) id 1247150181273971_31001; Thu, 9 Jul 2009 14:36:21 +0000 (UCT) Received: from svlb1extmailp02.amd.com (unknown [139.95.251.11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail8-tx2.bigfish.com (Postfix) with ESMTP id E69A9850051; Thu, 9 Jul 2009 14:36:20 +0000 (UTC) Received: from svlb1twp02.amd.com ([139.95.250.35]) by svlb1extmailp02.amd.com (Switch-3.2.7/Switch-3.2.7) with ESMTP id n69EaDUp030135; Thu, 9 Jul 2009 07:36:16 -0700 X-WSS-ID: 0KMIR7Z-04-GZP-01 Received: from SSVLEXBH2.amd.com (ssvlexbh2.amd.com [139.95.53.183]) by svlb1twp02.amd.com (Tumbleweed MailGate 3.5.1) with ESMTP id 22AA71103BF; Thu, 9 Jul 2009 07:35:59 -0700 (PDT) Received: from ssvlexmb2.amd.com ([139.95.53.7]) by SSVLEXBH2.amd.com with Microsoft SMTPSVC(6.0.3790.3959); Thu, 9 Jul 2009 07:36:06 -0700 Received: from SF36EXMB1.amd.com ([172.19.4.24]) by ssvlexmb2.amd.com with Microsoft SMTPSVC(6.0.3790.3959); Thu, 9 Jul 2009 07:36:06 -0700 Received: from seurexmb1.amd.com ([165.204.9.130]) by SF36EXMB1.amd.com with Microsoft SMTPSVC(6.0.3790.3959); Thu, 9 Jul 2009 16:36:03 +0200 Received: from lemmy.amd.com ([165.204.15.93]) by seurexmb1.amd.com with Microsoft SMTPSVC(6.0.3790.3959); Thu, 9 Jul 2009 16:36:03 +0200 Received: by lemmy.amd.com (Postfix, from userid 41430) id EA590C9A93; Thu, 9 Jul 2009 16:36:02 +0200 (CEST) From: Joerg Roedel To: Avi Kivity CC: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Joerg Roedel Subject: [PATCH] kvm/mmu: fix MMU_DEBUG compile breakage Date: Thu, 9 Jul 2009 16:36:01 +0200 Message-ID: <1247150161-28052-1-git-send-email-joerg.roedel@amd.com> X-Mailer: git-send-email 1.6.3.3 X-OriginalArrivalTime: 09 Jul 2009 14:36:03.0245 (UTC) FILETIME=[95DCADD0:01CA00A2] MIME-Version: 1.0 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Signed-off-by: Joerg Roedel --- arch/x86/kvm/mmu.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c index 231d880..7162651 100644 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c @@ -1786,8 +1786,8 @@ static void mmu_set_spte(struct kvm_vcpu *vcpu, u64 *sptep, pgprintk("%s: setting spte %llx\n", __func__, *sptep); pgprintk("instantiating %s PTE (%s) at %ld (%llx) addr %p\n", is_large_pte(*sptep)? "2MB" : "4kB", - is_present_pte(*sptep)?"RW":"R", gfn, - *shadow_pte, sptep); + *sptep & PT_PRESENT_MASK ?"RW":"R", gfn, + *sptep, sptep); if (!was_rmapped && is_large_pte(*sptep)) ++vcpu->kvm->stat.lpages;