bitkeeper revision 1.843.1.1 (408e7d81yryzADIp-4VdSvsB20fl9w)

more shadow log dirty stuff.

diff --git a/xen/common/memory.c b/xen/common/memory.c
index 420eb1ea3186e1dc264bfb145c613ae2bb4c6b5e..2e5ef181023c1d4e934f1272c7a2c3465d22b8ee 100644 (file)
--- a/xen/common/memory.c
+++ b/xen/common/memory.c
@@ -1060,6 +1060,12 @@ int do_mmu_update(mmu_update_t *ureqs, int count)
 
             machine_to_phys_mapping[pfn] = req.val;
             okay = 1;
+
+           /*  if in log dirty shadow mode, mark the corresponding 
+               psuedo-physical page as dirty */
+           if( unlikely(current->mm.shadow_mode == SHM_logdirty) )
+               mark_dirty( &current->mm, pfn );
+
             put_page(&frame_table[pfn]);
             break;
 

diff --git a/xen/net/dev.c b/xen/net/dev.c
index 31d80e2a1476ad15f695a0e8f353fa3fe0a811a3..aefd3a0df14fe13b7af7d198c1c29b5a3904741c 100644 (file)
--- a/xen/net/dev.c
+++ b/xen/net/dev.c
@@ -555,8 +555,11 @@ void deliver_packet(struct sk_buff *skb, net_vif_t *vif)
 
         // avoid the fault later
        *sptr = new_pte;
-
        unmap_domain_mem(sptr);
+
+       if( p->mm.shadow_mode == SHM_logdirty )
+               mark_dirty( &p->mm, new_page-frame_table );
+
        put_shadow_status(&p->mm);
     }