[Xen-changelog] [IA64] setting rr0 is not correctly emulated

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User awilliam@xxxxxxxxxxx
# Node ID edc63b5dd71d29dd52895b93ed72cb99c223fc38
# Parent  32c39e71740f085600b38f8196c3d73dceb1c6b8
[IA64] setting rr0 is not correctly emulated

When guest is not at metaphysical mode, VMM should
set machine rr0.

Signed-off-by: Anthony Xu <anthony.xu@xxxxxxxxx>

diff -r 32c39e71740f -r edc63b5dd71d xen/arch/ia64/xen/regionreg.c
--- a/xen/arch/ia64/xen/regionreg.c     Fri Mar 17 20:23:59 2006
+++ b/xen/arch/ia64/xen/regionreg.c     Fri Mar 17 20:44:48 2006
@@ -249,13 +249,18 @@
        newrrv.rid = newrid;
        newrrv.ve = 1;  // VHPT now enabled for region 7!!
        newrrv.ps = PAGE_SHIFT;
-       if (rreg == 0)
+
+       if (rreg == 0) {
                v->arch.metaphysical_saved_rr0 = vmMangleRID(newrrv.rrval);
-       else if (rreg == 7)
+               if (!PSCB(v,metaphysical_mode))
+                       set_rr(rr,newrrv.rrval);
+       } else if (rreg == 7) {
                ia64_new_rr7(vmMangleRID(newrrv.rrval),v->vcpu_info,
                             v->arch.privregs, __get_cpu_var(vhpt_paddr),
                             (unsigned long) pal_vaddr);
-       else set_rr(rr,newrrv.rrval);
+       } else {
+               set_rr(rr,newrrv.rrval);
+       }
 #endif
        return 1;
 }

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog