From patchwork Fri Dec 3 10:45:58 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joerg Roedel X-Patchwork-Id: 377171 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oB3Alecw031664 for ; Fri, 3 Dec 2010 10:47:41 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932473Ab0LCKq4 (ORCPT ); Fri, 3 Dec 2010 05:46:56 -0500 Received: from db3ehsobe006.messaging.microsoft.com ([213.199.154.144]:41320 "EHLO DB3EHSOBE006.bigfish.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932404Ab0LCKq0 (ORCPT ); Fri, 3 Dec 2010 05:46:26 -0500 Received: from mail84-db3-R.bigfish.com (10.3.81.243) by DB3EHSOBE006.bigfish.com (10.3.84.26) with Microsoft SMTP Server id 14.1.225.8; Fri, 3 Dec 2010 10:46:25 +0000 Received: from mail84-db3 (localhost.localdomain [127.0.0.1]) by mail84-db3-R.bigfish.com (Postfix) with ESMTP id 5607168130; Fri, 3 Dec 2010 10:46:25 +0000 (UTC) X-SpamScore: -2 X-BigFish: VPS-2(zzbb2cKzz1202hzz8275bhz32i691h668h62h) X-Spam-TCS-SCL: 1:0 X-Forefront-Antispam-Report: KIP:(null); UIP:(null); IPVD:NLI; H:ausb3twp01.amd.com; RD:none; EFVD:NLI Received: from mail84-db3 (localhost.localdomain [127.0.0.1]) by mail84-db3 (MessageSwitch) id 1291373185200422_26880; Fri, 3 Dec 2010 10:46:25 +0000 (UTC) Received: from DB3EHSMHS003.bigfish.com (unknown [10.3.81.251]) by mail84-db3.bigfish.com (Postfix) with ESMTP id 2EBECA30053; Fri, 3 Dec 2010 10:46:25 +0000 (UTC) Received: from ausb3twp01.amd.com (163.181.249.108) by DB3EHSMHS003.bigfish.com (10.3.87.103) with Microsoft SMTP Server id 14.1.225.8; Fri, 3 Dec 2010 10:46:21 +0000 X-WSS-ID: 0LCULX0-01-H0I-02 X-M-MSG: Received: from sausexedgep02.amd.com (sausexedgep02-ext.amd.com [163.181.249.73]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by ausb3twp01.amd.com (Tumbleweed MailGate 3.7.2) with ESMTP id 2ED9A1028595; Fri, 3 Dec 2010 04:46:11 -0600 (CST) Received: from sausexhtp02.amd.com (163.181.3.152) by sausexedgep02.amd.com (163.181.36.59) with Microsoft SMTP Server (TLS) id 8.3.106.1; Fri, 3 Dec 2010 04:47:36 -0600 Received: from storexhtp01.amd.com (172.24.4.3) by sausexhtp02.amd.com (163.181.3.152) with Microsoft SMTP Server (TLS) id 8.3.83.0; Fri, 3 Dec 2010 04:46:05 -0600 Received: from gwo.osrc.amd.com (165.204.16.204) by storexhtp01.amd.com (172.24.4.3) with Microsoft SMTP Server id 8.3.83.0; Fri, 3 Dec 2010 05:46:04 -0500 Received: from lemmy.osrc.amd.com (lemmy.osrc.amd.com [165.204.15.93]) by gwo.osrc.amd.com (Postfix) with ESMTP id BF9BB49C2C9; Fri, 3 Dec 2010 10:46:03 +0000 (GMT) Received: by lemmy.osrc.amd.com (Postfix, from userid 1000) id 31173101614; Fri, 3 Dec 2010 11:46:03 +0100 (CET) From: Joerg Roedel To: Avi Kivity , Marcelo Tosatti CC: , , Joerg Roedel Subject: [PATCH 11/12] KVM: SVM: Add clean-bit for CR2 register Date: Fri, 3 Dec 2010 11:45:58 +0100 Message-ID: <1291373159-4822-12-git-send-email-joerg.roedel@amd.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1291373159-4822-1-git-send-email-joerg.roedel@amd.com> References: <1291373159-4822-1-git-send-email-joerg.roedel@amd.com> MIME-Version: 1.0 X-OriginatorOrg: amd.com 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 (demeter1.kernel.org [140.211.167.41]); Fri, 03 Dec 2010 10:47:41 +0000 (UTC) diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index 4c366fe..7643f83 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -196,11 +196,12 @@ enum { VMCB_DR, /* DR6, DR7 */ VMCB_DT, /* GDT, IDT */ VMCB_SEG, /* CS, DS, SS, ES, CPL */ + VMCB_CR2, /* CR2 only */ VMCB_DIRTY_MAX, }; -/* TPR is always written before VMRUN */ -#define VMCB_ALWAYS_DIRTY_MASK (1U << VMCB_INTR) +/* TPR and CR2 are always written before VMRUN */ +#define VMCB_ALWAYS_DIRTY_MASK ((1U << VMCB_INTR) | (1U << VMCB_CR2)) static inline void mark_all_dirty(struct vmcb *vmcb) {