From: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Date: Mon, 22 Jun 2015 15:52:39 +0000 (+0200)
Subject: x86/pvh: properly initialize PVH guest's CR3
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~3054
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=12e88138233f1444388dbc346c5aa6c0a1d45d9f;p=xen.git

x86/pvh: properly initialize PVH guest's CR3

.. based on whether the guest is 32- or 64-bit

Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Reviewed-by: Jan Beulich <jbeulich@suse.com>
---

diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c
index c7ef1e6aaa..ba28f38f75 100644
--- a/xen/arch/x86/domain.c
+++ b/xen/arch/x86/domain.c
@@ -828,7 +828,7 @@ int arch_set_info_guest(
         cr3_page = get_page_from_gfn(d, cr3_gfn, NULL, P2M_ALLOC);
 
         v->arch.cr3 = page_to_maddr(cr3_page);
-        v->arch.hvm_vcpu.guest_cr[3] = c.nat->ctrlreg[3];
+        v->arch.hvm_vcpu.guest_cr[3] = c(ctrlreg[3]);
         v->arch.guest_table = pagetable_from_page(cr3_page);
 
         ASSERT(paging_mode_enabled(d));