X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_sym_swap.h;h=e104acc77fecc5a9f83cf3f3a59e16f9ce185e30;hp=6931ea162b8301f9d42fd476d504d0d0120f414b;hb=0121a4503305424096e2b5c5bd3b6c3af2d813e5;hpb=2304917404cd287c4741d9f85ff8a280e248c7d0

diff --git a/palacios/include/palacios/vmm_sym_swap.h b/palacios/include/palacios/vmm_sym_swap.h
index 6931ea1..e104acc 100644
--- a/palacios/include/palacios/vmm_sym_swap.h
+++ b/palacios/include/palacios/vmm_sym_swap.h
@@ -23,32 +23,63 @@
 #ifdef __V3VEE__ 
 #ifdef CONFIG_SYMBIOTIC_SWAP
 
-#include <palacios/vmm.h>
+#include <palacios/vmm_types.h>
+#include <palacios/vmm_paging.h>
+#include <palacios/vmm_hashtable.h>
 
-static inline int is_swapped_pte32(pte32_t * pte) {
-    return (*(uint32_t *)pte != 0);
-}
+
+struct v3_swap_ops {
+    void * (*get_swap_entry)(uint32_t pg_index, void * private_data);
+};
 
 
 struct v3_swap_dev {
-    addr_t (*get_page)(int index);
+    uint8_t present;
 
+    struct v3_swap_ops * ops;
+
+    void * private_data;
 };
 
 
 struct v3_sym_swap_state {
-    struct v3_swap_dev[256];
+    struct v3_swap_dev devs[256];
+
+#ifdef CONFIG_SYMBIOTIC_SWAP_TELEMETRY
+    uint32_t read_faults;
+    uint32_t write_faults;
+    uint32_t flushes;
+    uint32_t mapped_pages;
+    uint32_t list_size;
+#endif
 
+    // shadow pointers
+    struct hashtable * shdw_ptr_ht;
 };
 
+// Present = 0 and Dirty = 0
+// fixme
+static inline int is_swapped_pte32(pte32_t * pte) {
+    return ((pte->present == 0) && (*(uint32_t *)pte != 0));
+}
+
+
 
 int v3_init_sym_swap(struct guest_info * info);
 
-addr_t v3_get_swapped_pg_addr(pte32_t * pte);
+int v3_register_swap_disk(struct guest_info * info, int dev_index, 
+			  struct v3_swap_ops * ops, void * private_data);
+
+int v3_swap_in_notify(struct guest_info * info, int pg_index, int dev_index);
 
 
+int v3_get_vaddr_perms(struct guest_info * info, addr_t vaddr, pte32_t * guest_pte, pf_error_t * page_perms);
+addr_t v3_get_swapped_pg_addr(struct guest_info * info, pte32_t * guest_pte);
+addr_t v3_map_swp_page(struct guest_info * info, pte32_t * shadow_pte, pte32_t * guest_pte, void * swp_page_ptr);
+
+int v3_swap_flush(struct guest_info * info);
+
 
 #endif
 #endif
-
 #endif