On Wednesday 08 September 2010 17:22:09 Qing He wrote:
> the VMCS region used for vmxon is named host_vmcs, which is
> somewhat misleading in nested virtualization context, rename it
> to vmxon_vmcs.
>
> Signed-off-by: Qing He <qing.he@xxxxxxxxx>
> Signed-off-by: Eddie Dong <eddie.dong@xxxxxxxxx>
Acked-by: Christoph Egger <Christoph.Egger@xxxxxxx>
> ---
>
> diff -r d6a8d49f3526 xen/arch/x86/hvm/vmx/vmcs.c
> --- a/xen/arch/x86/hvm/vmx/vmcs.c Mon Jul 26 14:42:21 2010 +0800
> +++ b/xen/arch/x86/hvm/vmx/vmcs.c Wed Aug 04 16:30:40 2010 +0800
> @@ -67,7 +67,7 @@
> 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_vmcs);
> static DEFINE_PER_CPU(struct vmcs_struct *, current_vmcs);
> static DEFINE_PER_CPU(struct list_head, active_vmcs_list);
>
> @@ -427,11 +427,11 @@
>
> int vmx_cpu_up_prepare(unsigned int cpu)
> {
> - if ( per_cpu(host_vmcs, cpu) != NULL )
> + if ( per_cpu(vmxon_vmcs, cpu) != NULL )
> return 0;
>
> - per_cpu(host_vmcs, cpu) = vmx_alloc_vmcs();
> - if ( per_cpu(host_vmcs, cpu) != NULL )
> + per_cpu(vmxon_vmcs, cpu) = vmx_alloc_vmcs();
> + if ( per_cpu(vmxon_vmcs, cpu) != NULL )
> return 0;
>
> printk("CPU%d: Could not allocate host VMCS\n", cpu);
> @@ -440,8 +440,8 @@
>
> 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_vmcs, cpu));
> + per_cpu(vmxon_vmcs, cpu) = NULL;
> }
>
> int vmx_cpu_up(void)
> @@ -498,7 +498,7 @@
> 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_vmcs))) )
> {
> case -2: /* #UD or #GP */
> if ( bios_locked &&
>
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@xxxxxxxxxxxxxxxxxxx
> http://lists.xensource.com/xen-devel
--
---to satisfy European Law for business letters:
Advanced Micro Devices GmbH
Einsteinring 24, 85609 Dornach b. Muenchen
Geschaeftsfuehrer: Alberto Bozzo, Andrew Bowd
Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen
Registergericht Muenchen, HRB Nr. 43632
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
|
Home