# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1284395050 -3600
# Node ID 78b16cd326dd51bf577ed2ff7cf657baca96a70d
# Parent 258b93411302284ab6dc52a2068425e00ab7c911
vmx: Rename host_vmcs to vmxon_region
For some reason, the memory region used for vmxon is named as
host_vmcs, which is somewhat misleading, rename it to vmxon_region as
SDM does.
Signed-off-by: Qing He <qing.he@xxxxxxxxx>
Signed-off-by: Eddie Dong <eddie.dong@xxxxxxxxx>
---
xen/arch/x86/hvm/vmx/vmcs.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff -r 258b93411302 -r 78b16cd326dd xen/arch/x86/hvm/vmx/vmcs.c
--- a/xen/arch/x86/hvm/vmx/vmcs.c Mon Sep 13 17:17:01 2010 +0100
+++ b/xen/arch/x86/hvm/vmx/vmcs.c Mon Sep 13 17:24:10 2010 +0100
@@ -67,7 +67,7 @@ u64 vmx_ept_vpid_cap __read_mostly;
u64 vmx_ept_vpid_cap __read_mostly;
bool_t cpu_has_vmx_ins_outs_instr_info __read_mostly;
-static DEFINE_PER_CPU_READ_MOSTLY(struct vmcs_struct *, host_vmcs);
+static DEFINE_PER_CPU_READ_MOSTLY(struct vmcs_struct *, vmxon_region);
static DEFINE_PER_CPU(struct vmcs_struct *, current_vmcs);
static DEFINE_PER_CPU(struct list_head, active_vmcs_list);
@@ -427,11 +427,11 @@ static void vmx_load_vmcs(struct vcpu *v
int vmx_cpu_up_prepare(unsigned int cpu)
{
- if ( per_cpu(host_vmcs, cpu) != NULL )
+ if ( per_cpu(vmxon_region, cpu) != NULL )
return 0;
- per_cpu(host_vmcs, cpu) = vmx_alloc_vmcs();
- if ( per_cpu(host_vmcs, cpu) != NULL )
+ per_cpu(vmxon_region, cpu) = vmx_alloc_vmcs();
+ if ( per_cpu(vmxon_region, cpu) != NULL )
return 0;
printk("CPU%d: Could not allocate host VMCS\n", cpu);
@@ -440,8 +440,8 @@ int vmx_cpu_up_prepare(unsigned int cpu)
void vmx_cpu_dead(unsigned int cpu)
{
- vmx_free_vmcs(per_cpu(host_vmcs, cpu));
- per_cpu(host_vmcs, cpu) = NULL;
+ vmx_free_vmcs(per_cpu(vmxon_region, cpu));
+ per_cpu(vmxon_region, cpu) = NULL;
}
int vmx_cpu_up(void)
@@ -498,7 +498,7 @@ int vmx_cpu_up(void)
if ( (rc = vmx_cpu_up_prepare(cpu)) != 0 )
return rc;
- switch ( __vmxon(virt_to_maddr(this_cpu(host_vmcs))) )
+ switch ( __vmxon(virt_to_maddr(this_cpu(vmxon_region))) )
{
case -2: /* #UD or #GP */
if ( bios_locked &&
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home