X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_msr.h;h=f494772a370819de224d6da6edefd69e930f6171;hb=ee8666572bea1a9628d96ebc3e4d97f84b357134;hp=00e1425a2fcffdd41c7088e2c95770707f9aab51;hpb=9b4bfeefac09294a6f0ae12dbadf102eb547f5ec;p=palacios.git

diff --git a/palacios/include/palacios/vmm_msr.h b/palacios/include/palacios/vmm_msr.h
index 00e1425..f494772 100644
--- a/palacios/include/palacios/vmm_msr.h
+++ b/palacios/include/palacios/vmm_msr.h
@@ -27,28 +27,28 @@
 #include <palacios/vmm_list.h>
 
 struct guest_info;
+struct v3_vm_info;
 
 struct v3_msr {
 
     union {
-	ullong_t value;
+	uint64_t value;
 
 	struct {
-	    uint_t lo;
-	    uint_t hi;
+	    uint32_t lo;
+	    uint32_t hi;
 	} __attribute__((packed));
     } __attribute__((packed));
 } __attribute__((packed));
 
 
-
 typedef struct v3_msr v3_msr_t;
 
 struct v3_msr_hook {
     uint_t msr;
   
-    int (*read)(uint_t msr, struct v3_msr * dst, void * priv_data);
-    int (*write)(uint_t msr, struct v3_msr src, void * priv_data);
+    int (*read)(struct guest_info * core, uint_t msr, struct v3_msr * dst, void * priv_data);
+    int (*write)(struct guest_info * core, uint_t msr, struct v3_msr src, void * priv_data);
 
     void * priv_data;
 
@@ -62,22 +62,32 @@ struct v3_msr_hook;
 struct v3_msr_map {
     uint_t num_hooks;
     struct list_head hook_list;
+
+    int (*update_map)(struct v3_vm_info * vm, uint_t msr, int hook_read, int hook_write);
+    void * arch_data;
+
 };
 
 
-void v3_init_msr_map(struct guest_info * info);
+void v3_init_msr_map(struct v3_vm_info * vm);
 
-int v3_unhook_msr(struct guest_info * info, uint_t msr);
+int v3_unhook_msr(struct v3_vm_info * vm, uint_t msr);
 
-int v3_hook_msr(struct guest_info * info, uint_t msr,
-		int (*read)(uint_t msr, struct v3_msr * dst, void * priv_data),
-		int (*write)(uint_t msr, struct v3_msr src, void * priv_data), 
+int v3_hook_msr(struct v3_vm_info * vm, uint_t msr,
+		int (*read)(struct guest_info * core, uint_t msr, struct v3_msr * dst, void * priv_data),
+		int (*write)(struct guest_info * core, uint_t msr, struct v3_msr src, void * priv_data), 
 		void * priv_data);
 
 
-struct v3_msr_hook * v3_get_msr_hook(struct guest_info * info, uint_t msr);
+struct v3_msr_hook * v3_get_msr_hook(struct v3_vm_info * vm, uint_t msr);
+
+void v3_refresh_msr_map(struct v3_vm_info * vm);
+
+void v3_print_msr_map(struct v3_vm_info * vm);
+
+int v3_handle_msr_write(struct guest_info * info);
 
-void v3_print_msr_map(struct guest_info * info);
+int v3_handle_msr_read(struct guest_info * info);