From: Avi Kivity <avi@redhat.com>
To: kvm@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH 18/38] KVM: Rename vcpu->shadow_efer to efer
Date: Tue, 16 Feb 2010 12:35:16 +0200 [thread overview]
Message-ID: <1266316536-28936-19-git-send-email-avi@redhat.com> (raw)
In-Reply-To: <1266316536-28936-1-git-send-email-avi@redhat.com>
None of the other registers have the shadow_ prefix.
Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
---
arch/x86/include/asm/kvm_host.h | 2 +-
arch/x86/kvm/mmu.c | 2 +-
arch/x86/kvm/svm.c | 12 ++++++------
arch/x86/kvm/vmx.c | 14 +++++++-------
arch/x86/kvm/x86.c | 14 +++++++-------
arch/x86/kvm/x86.h | 2 +-
6 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
index 7ebf9fe..1522337 100644
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -277,7 +277,7 @@ struct kvm_vcpu_arch {
unsigned long cr8;
u32 hflags;
u64 pdptrs[4]; /* pae */
- u64 shadow_efer;
+ u64 efer;
u64 apic_base;
struct kvm_lapic *apic; /* kernel irqchip context */
int32_t apic_arb_prio;
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
index 6f7158f..599c422 100644
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@ -237,7 +237,7 @@ static int is_cpuid_PSE36(void)
static int is_nx(struct kvm_vcpu *vcpu)
{
- return vcpu->arch.shadow_efer & EFER_NX;
+ return vcpu->arch.efer & EFER_NX;
}
static int is_shadow_present_pte(u64 pte)
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
index 800208a..9596cc8 100644
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
@@ -231,7 +231,7 @@ static void svm_set_efer(struct kvm_vcpu *vcpu, u64 efer)
efer &= ~EFER_LME;
to_svm(vcpu)->vmcb->save.efer = efer | EFER_SVME;
- vcpu->arch.shadow_efer = efer;
+ vcpu->arch.efer = efer;
}
static void svm_queue_exception(struct kvm_vcpu *vcpu, unsigned nr,
@@ -996,14 +996,14 @@ static void svm_set_cr0(struct kvm_vcpu *vcpu, unsigned long cr0)
struct vcpu_svm *svm = to_svm(vcpu);
#ifdef CONFIG_X86_64
- if (vcpu->arch.shadow_efer & EFER_LME) {
+ if (vcpu->arch.efer & EFER_LME) {
if (!is_paging(vcpu) && (cr0 & X86_CR0_PG)) {
- vcpu->arch.shadow_efer |= EFER_LMA;
+ vcpu->arch.efer |= EFER_LMA;
svm->vmcb->save.efer |= EFER_LMA | EFER_LME;
}
if (is_paging(vcpu) && !(cr0 & X86_CR0_PG)) {
- vcpu->arch.shadow_efer &= ~EFER_LMA;
+ vcpu->arch.efer &= ~EFER_LMA;
svm->vmcb->save.efer &= ~(EFER_LMA | EFER_LME);
}
}
@@ -1361,7 +1361,7 @@ static int vmmcall_interception(struct vcpu_svm *svm)
static int nested_svm_check_permissions(struct vcpu_svm *svm)
{
- if (!(svm->vcpu.arch.shadow_efer & EFER_SVME)
+ if (!(svm->vcpu.arch.efer & EFER_SVME)
|| !is_paging(&svm->vcpu)) {
kvm_queue_exception(&svm->vcpu, UD_VECTOR);
return 1;
@@ -1764,7 +1764,7 @@ static bool nested_svm_vmrun(struct vcpu_svm *svm)
hsave->save.ds = vmcb->save.ds;
hsave->save.gdtr = vmcb->save.gdtr;
hsave->save.idtr = vmcb->save.idtr;
- hsave->save.efer = svm->vcpu.arch.shadow_efer;
+ hsave->save.efer = svm->vcpu.arch.efer;
hsave->save.cr0 = kvm_read_cr0(&svm->vcpu);
hsave->save.cr4 = svm->vcpu.arch.cr4;
hsave->save.rflags = vmcb->save.rflags;
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 2e89495..a680d93 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -613,7 +613,7 @@ static bool update_transition_efer(struct vcpu_vmx *vmx, int efer_offset)
u64 guest_efer;
u64 ignore_bits;
- guest_efer = vmx->vcpu.arch.shadow_efer;
+ guest_efer = vmx->vcpu.arch.efer;
/*
* NX is emulated; LMA and LME handled by hardware; SCE meaninless
@@ -955,7 +955,7 @@ static void setup_msrs(struct vcpu_vmx *vmx)
* if efer.sce is enabled.
*/
index = __find_msr_index(vmx, MSR_K6_STAR);
- if ((index >= 0) && (vmx->vcpu.arch.shadow_efer & EFER_SCE))
+ if ((index >= 0) && (vmx->vcpu.arch.efer & EFER_SCE))
move_msr_up(vmx, index, save_nmsrs++);
}
#endif
@@ -1600,7 +1600,7 @@ static void vmx_set_efer(struct kvm_vcpu *vcpu, u64 efer)
* of this msr depends on is_long_mode().
*/
vmx_load_host_state(to_vmx(vcpu));
- vcpu->arch.shadow_efer = efer;
+ vcpu->arch.efer = efer;
if (!msr)
return;
if (efer & EFER_LMA) {
@@ -1632,13 +1632,13 @@ static void enter_lmode(struct kvm_vcpu *vcpu)
(guest_tr_ar & ~AR_TYPE_MASK)
| AR_TYPE_BUSY_64_TSS);
}
- vcpu->arch.shadow_efer |= EFER_LMA;
- vmx_set_efer(vcpu, vcpu->arch.shadow_efer);
+ vcpu->arch.efer |= EFER_LMA;
+ vmx_set_efer(vcpu, vcpu->arch.efer);
}
static void exit_lmode(struct kvm_vcpu *vcpu)
{
- vcpu->arch.shadow_efer &= ~EFER_LMA;
+ vcpu->arch.efer &= ~EFER_LMA;
vmcs_write32(VM_ENTRY_CONTROLS,
vmcs_read32(VM_ENTRY_CONTROLS)
@@ -1745,7 +1745,7 @@ static void vmx_set_cr0(struct kvm_vcpu *vcpu, unsigned long cr0)
enter_rmode(vcpu);
#ifdef CONFIG_X86_64
- if (vcpu->arch.shadow_efer & EFER_LME) {
+ if (vcpu->arch.efer & EFER_LME) {
if (!is_paging(vcpu) && (cr0 & X86_CR0_PG))
enter_lmode(vcpu);
if (is_paging(vcpu) && !(cr0 & X86_CR0_PG))
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index a4a7d18..27af6e3 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -456,7 +456,7 @@ void kvm_set_cr0(struct kvm_vcpu *vcpu, unsigned long cr0)
if (!is_paging(vcpu) && (cr0 & X86_CR0_PG)) {
#ifdef CONFIG_X86_64
- if ((vcpu->arch.shadow_efer & EFER_LME)) {
+ if ((vcpu->arch.efer & EFER_LME)) {
int cs_db, cs_l;
if (!is_pae(vcpu)) {
@@ -655,7 +655,7 @@ static void set_efer(struct kvm_vcpu *vcpu, u64 efer)
}
if (is_paging(vcpu)
- && (vcpu->arch.shadow_efer & EFER_LME) != (efer & EFER_LME)) {
+ && (vcpu->arch.efer & EFER_LME) != (efer & EFER_LME)) {
printk(KERN_DEBUG "set_efer: #GP, change LME while paging\n");
kvm_inject_gp(vcpu, 0);
return;
@@ -686,9 +686,9 @@ static void set_efer(struct kvm_vcpu *vcpu, u64 efer)
kvm_x86_ops->set_efer(vcpu, efer);
efer &= ~EFER_LMA;
- efer |= vcpu->arch.shadow_efer & EFER_LMA;
+ efer |= vcpu->arch.efer & EFER_LMA;
- vcpu->arch.shadow_efer = efer;
+ vcpu->arch.efer = efer;
vcpu->arch.mmu.base_role.nxe = (efer & EFER_NX) && !tdp_enabled;
kvm_mmu_reset_context(vcpu);
@@ -1426,7 +1426,7 @@ int kvm_get_msr_common(struct kvm_vcpu *vcpu, u32 msr, u64 *pdata)
data |= (((uint64_t)4ULL) << 40);
break;
case MSR_EFER:
- data = vcpu->arch.shadow_efer;
+ data = vcpu->arch.efer;
break;
case MSR_KVM_WALL_CLOCK:
data = vcpu->kvm->arch.wall_clock;
@@ -4569,7 +4569,7 @@ int kvm_arch_vcpu_ioctl_get_sregs(struct kvm_vcpu *vcpu,
sregs->cr3 = vcpu->arch.cr3;
sregs->cr4 = kvm_read_cr4(vcpu);
sregs->cr8 = kvm_get_cr8(vcpu);
- sregs->efer = vcpu->arch.shadow_efer;
+ sregs->efer = vcpu->arch.efer;
sregs->apic_base = kvm_get_apic_base(vcpu);
memset(sregs->interrupt_bitmap, 0, sizeof sregs->interrupt_bitmap);
@@ -5059,7 +5059,7 @@ int kvm_arch_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu,
kvm_set_cr8(vcpu, sregs->cr8);
- mmu_reset_needed |= vcpu->arch.shadow_efer != sregs->efer;
+ mmu_reset_needed |= vcpu->arch.efer != sregs->efer;
kvm_x86_ops->set_efer(vcpu, sregs->efer);
kvm_set_apic_base(vcpu, sregs->apic_base);
diff --git a/arch/x86/kvm/x86.h b/arch/x86/kvm/x86.h
index 2dc24a7..2d10163 100644
--- a/arch/x86/kvm/x86.h
+++ b/arch/x86/kvm/x86.h
@@ -44,7 +44,7 @@ static inline bool is_protmode(struct kvm_vcpu *vcpu)
static inline int is_long_mode(struct kvm_vcpu *vcpu)
{
#ifdef CONFIG_X86_64
- return vcpu->arch.shadow_efer & EFER_LMA;
+ return vcpu->arch.efer & EFER_LMA;
#else
return 0;
#endif
--
1.6.5.3
next prev parent reply other threads:[~2010-02-16 10:36 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-16 10:34 [PATCH 00/38] KVM updates for the 2.6.34 merge window (batch 3/4) Avi Kivity
2010-02-16 10:34 ` [PATCH 01/38] KVM: export <asm/hyperv.h> Avi Kivity
2010-02-16 10:35 ` [PATCH 02/38] KVM: VMX: Remove emulation failure report Avi Kivity
2010-02-16 10:35 ` [PATCH 03/38] KVM: fix Hyper-V hypercall warnings and wrong mask value Avi Kivity
2010-02-16 10:35 ` [PATCH 04/38] KVM: fix cleanup_srcu_struct on vm destruction Avi Kivity
2010-02-16 10:35 ` [PATCH 05/38] KVM: x86: Use macros for x86_emulate_ops to avoid future mistakes Avi Kivity
2010-02-16 10:35 ` [PATCH 06/38] KVM: VMX: Fix exceptions of mov to dr Avi Kivity
2010-02-16 10:35 ` [PATCH 07/38] KVM: VMX: Fix emulation of DR4 and DR5 Avi Kivity
2010-02-16 10:35 ` [PATCH 08/38] KVM: VMX: Clean up DR6 emulation Avi Kivity
2010-02-16 10:35 ` [PATCH 09/38] KVM: SVM: Clean up and enhance mov dr emulation Avi Kivity
2010-02-16 10:35 ` [PATCH 10/38] KVM: SVM: Trap all debug register accesses Avi Kivity
2010-02-16 10:35 ` [PATCH 11/38] KVM: Fix kvm_coalesced_mmio_ring duplicate allocation Avi Kivity
2010-02-16 10:35 ` [PATCH 12/38] KVM: x86: fix checking of cr0 validity Avi Kivity
2010-02-16 10:35 ` [PATCH 13/38] KVM: Allow kvm_load_guest_fpu() even when !vcpu->fpu_active Avi Kivity
2010-02-16 10:35 ` [PATCH 14/38] KVM: Drop kvm_{load,put}_guest_fpu() exports Avi Kivity
2010-02-16 10:35 ` [PATCH 15/38] KVM: Activate fpu on clts Avi Kivity
2010-02-16 10:35 ` [PATCH 16/38] KVM: Add a helper for checking if the guest is in protected mode Avi Kivity
2010-02-16 10:35 ` [PATCH 17/38] KVM: Move cr0/cr4/efer related helpers to x86.h Avi Kivity
2010-02-16 10:35 ` Avi Kivity [this message]
2010-02-16 10:35 ` [PATCH 19/38] KVM: Optimize kvm_read_cr[04]_bits() Avi Kivity
2010-02-16 10:35 ` [PATCH 20/38] KVM: trace guest fpu loads and unloads Avi Kivity
2010-02-16 10:35 ` [PATCH 21/38] KVM: MMU: Remove some useless code from alloc_mmu_pages() Avi Kivity
2010-02-16 10:35 ` [PATCH 22/38] KVM: PPC E500: Add register l1csr0 emulation Avi Kivity
2010-02-16 10:35 ` [PATCH 23/38] KVM: PPC: Add PVR/PIR init for E500 Avi Kivity
2010-02-16 10:35 ` [PATCH 24/38] KVM: PPC E500: fix tlbcfg emulation Avi Kivity
2010-02-16 10:35 ` [PATCH 25/38] KVM: VMX: Pass cr0.mp through to the guest when the fpu is active Avi Kivity
2010-02-16 10:35 ` [PATCH 26/38] KVM: mark segments accessed on HW task switch Avi Kivity
2010-02-16 10:35 ` [PATCH 27/38] KVM: Fix msr trace Avi Kivity
2010-02-16 10:35 ` [PATCH 28/38] KVM: Trace failed msr reads and writes Avi Kivity
2010-02-16 10:35 ` [PATCH 29/38] KVM: VMX: Remove redundant check in vm_need_virtualize_apic_accesses() Avi Kivity
2010-02-16 10:35 ` [PATCH 30/38] KVM: enable PCI multiple-segments for pass-through device Avi Kivity
2010-02-16 10:35 ` [PATCH 31/38] KVM: fix load_guest_segment_descriptor() to return X86EMUL_* Avi Kivity
2010-02-16 10:35 ` [PATCH 32/38] KVM: fix kvm_fix_hypercall() " Avi Kivity
2010-02-16 10:35 ` [PATCH 33/38] KVM: VMX: Wire up .fpu_activate() callback Avi Kivity
2010-02-16 10:35 ` [PATCH 34/38] KVM: ia64: Fix string literal continuation lines Avi Kivity
2010-02-16 10:35 ` [PATCH 35/38] KVM: VMX: Remove redundant test in vmx_set_efer() Avi Kivity
2010-02-16 10:35 ` [PATCH 36/38] KVM: Introduce kvm_host_page_size Avi Kivity
2010-02-16 10:35 ` [PATCH 37/38] KVM: VMX: emulate accessed bit for EPT Avi Kivity
2010-02-16 10:35 ` [PATCH 38/38] KVM: Remove redundant reading of rax on OUT instructions Avi Kivity
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1266316536-28936-19-git-send-email-avi@redhat.com \
--to=avi@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.