X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_sym_swap.c;h=3b1620cae4e4d5b7fbd04afccf993c78e5cdb36d;hb=ec01e0d8a7a3debd92ce2787a9d8bfd15d38df04;hp=5c8cad8248aeaae704099117c22891e81dc9277d;hpb=123a1ba27ea09c8fa77a1b36ce625b43d7c48b14;p=palacios.git

diff --git a/palacios/src/palacios/vmm_sym_swap.c b/palacios/src/palacios/vmm_sym_swap.c
index 5c8cad8..3b1620c 100644
--- a/palacios/src/palacios/vmm_sym_swap.c
+++ b/palacios/src/palacios/vmm_sym_swap.c
@@ -155,6 +155,10 @@ int v3_swap_flush(struct guest_info * info) {
     swap_state->flushes++;
 #endif
 
+    if (!ht_iter) {
+	PrintError("NULL iterator in swap flush!! Probably will crash soon...\n");
+    }
+
     while (ht_iter->entry) {
 	struct shadow_pointer * tmp_shdw_ptr = NULL;
 	struct shadow_pointer * shdw_ptr = NULL;
@@ -164,22 +168,28 @@ int v3_swap_flush(struct guest_info * info) {
 	// we can leave the list_head structures and reuse them for the next round
 	
 	list_for_each_entry_safe(shdw_ptr, tmp_shdw_ptr, shdw_ptr_list, node) {
+	    if (shdw_ptr == NULL) {
+		PrintError("Null shadow pointer in swap flush!! Probably crashing soon...\n");
+	    }
+
 	    // Trigger faults for next shadow access
 	    shdw_ptr->shadow_pte->present = 0;
 	    
 	    // Delete entry from list
 	    list_del(&(shdw_ptr->node));
-	    V3_Free(shdw_ptr);	    
+	    V3_Free(shdw_ptr);
 	}
 
 	v3_htable_iter_advance(ht_iter);
     }
 
+    V3_Free(ht_iter);
+
     return 0;
 }
 
 int v3_get_vaddr_perms(struct guest_info * info, addr_t vaddr, pte32_t * guest_pte, pf_error_t * page_perms) {
-    uint32_t pte_val = *(uint32_t *)guest_pte;
+    uint64_t pte_val = (uint64_t)*(uint32_t *)guest_pte;
 
     // symcall to check if page is in cache or on swap disk
     if (v3_sym_call3(info, SYMCALL_MEM_LOOKUP, (uint64_t *)&vaddr, (uint64_t *)&pte_val, (uint64_t *)page_perms) == -1) {
@@ -187,7 +197,7 @@ int v3_get_vaddr_perms(struct guest_info * info, addr_t vaddr, pte32_t * guest_p
 	return -1;
     }
 
-    V3_Print("page perms = %x\n", *(uint32_t *)page_perms);
+    //    V3_Print("page perms = %x\n", *(uint32_t *)page_perms);
 
     return 0;
 }