1.1 --- a/xen/arch/x86/mm/shadow/multi.c	Thu Dec 21 13:43:19 2006 +0000
     1.2 +++ b/xen/arch/x86/mm/shadow/multi.c	Thu Dec 21 13:48:13 2006 +0000
     1.3 @@ -3342,11 +3342,12 @@ sh_update_cr3(struct vcpu *v, int do_loc
     1.4  /* Updates vcpu->arch.cr3 after the guest has changed CR3.
     1.5   * Paravirtual guests should set v->arch.guest_table (and guest_table_user,
     1.6   * if appropriate).
     1.7 - * HVM guests should also make sure hvm_get_guest_cntl_reg(v, 3) works,
     1.8 - * and read vcpu->arch.hvm_vcpu.hw_cr3 afterwards.
     1.9 + * HVM guests should also make sure hvm_get_guest_cntl_reg(v, 3) works;
    1.10 + * this function will call hvm_update_guest_cr3() to tell them where the 
    1.11 + * shadow tables are.
    1.12   * If do_locking != 0, assume we are being called from outside the 
    1.13   * shadow code, and must take and release the shadow lock; otherwise 
    1.14 - * that is the caller's respnsibility.
    1.15 + * that is the caller's responsibility.
    1.16   */
    1.17  {
    1.18      struct domain *d = v->domain;

     2.1 --- a/xen/include/asm-x86/shadow.h	Thu Dec 21 13:43:19 2006 +0000
     2.2 +++ b/xen/include/asm-x86/shadow.h	Thu Dec 21 13:48:13 2006 +0000
     2.3 @@ -248,11 +248,9 @@ static inline unsigned long shadow_gva_t
     2.4      return v->arch.shadow.mode->gva_to_gfn(v, va);
     2.5  }
     2.6  
     2.7 -/* Update all the things that are derived from the guest's CR3. 
     2.8 - * Called when the guest changes CR3; the caller can then use 
     2.9 - * v->arch.cr3 as the value to load into the host CR3 to schedule this vcpu
    2.10 - * and v->arch.hvm_vcpu.hw_cr3 as the value to put in the vmcb/vmcs when 
    2.11 - * entering the HVM guest. */
    2.12 +/* Update all the things that are derived from the guest's CR3.  
    2.13 + * Called when the guest changes CR3; the caller can then use v->arch.cr3 
    2.14 + * as the value to load into the host CR3 to schedule this vcpu */
    2.15  static inline void shadow_update_cr3(struct vcpu *v)
    2.16  {
    2.17      v->arch.shadow.mode->update_cr3(v, 1);