Changeset 8cd140f2 in mainline for kernel/arch/ia32xen/src/ia32xen.c

Timestamp:

2006-12-11T14:14:46Z (18 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

134877d

Parents:

b82a13c

Message:

update for Xen

File:

• kernel/arch/ia32xen/src/ia32xen.c (modified) (4 diffs)

kernel/arch/ia32xen/src/ia32xen.c

@@ -72 +72 @@
 void arch_pre_main(void)
 {
-        xen_vm_assist(VMASST_CMD_ENABLE, VMASST_TYPE_WRITABLE_PAGETABLES);
-        
         pte_t pte;
         memsetb((uintptr_t) &pte, sizeof(pte), 0);
@@ -80 +78 @@
         pte.writeable = 1;
         pte.frame_address = ADDR2PFN((uintptr_t) start_info.shared_info);
-        xen_update_va_mapping(&shared_info, pte, UVMF_INVLPG);
-        
-        pte.present = 1;
-        pte.writeable = 1;
-        pte.frame_address = start_info.console_mfn;
-        xen_update_va_mapping(&console_page, pte, UVMF_INVLPG);
-        
-        xen_set_callbacks(XEN_CS, xen_callback, XEN_CS, xen_failsafe_callback);
+        ASSERT(xen_update_va_mapping(&shared_info, pte, UVMF_INVLPG) == 0);
+        
+        if (!(start_info.flags & SIF_INITDOMAIN)) {
+                /* Map console frame */
+                pte.present = 1;
+                pte.writeable = 1;
+                pte.frame_address = start_info.console.domU.mfn;
+                ASSERT(xen_update_va_mapping(&console_page, pte, UVMF_INVLPG) == 0);
+        } else
+                start_info.console.domU.evtchn = 0;
+        
+        ASSERT(xen_set_callbacks(XEN_CS, xen_callback, XEN_CS, xen_failsafe_callback) == 0);
         
         /* Create identity mapping */
@@ -94 +96 @@
         meminfo.size = start_info.frames - meminfo.start;
         meminfo.reserved = 0;
-        
+
         uintptr_t pa;
         index_t last_ptl0 = 0;
@@ -108 +110 @@
                         
                         pte_t *tptl3 = (pte_t *) PA2KA(GET_PTL1_ADDRESS(start_info.ptl0, PTL0_INDEX(tva)));
-                        SET_FRAME_FLAGS(tptl3, PTL3_INDEX(tva), PAGE_PRESENT);
+                        SET_FRAME_ADDRESS(tptl3, PTL3_INDEX(tva), 0);
                         SET_PTL1_ADDRESS(start_info.ptl0, PTL0_INDEX(va), tpa);
+                        SET_FRAME_ADDRESS(tptl3, PTL3_INDEX(tva), tpa);
                         
                         last_ptl0 = PTL0_INDEX(va);