X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_msr.c;h=68d476746b60ab670c23357c61a012bb52bea43a;hb=786d89d4e5c6bb25c3dd07ec3bb375c5964f2af2;hp=3b13f6b892ddfd33f3c60aeb14e77bc729ae6f30;hpb=4a9377be280dd8f2c298fd845d63728650a1060f;p=palacios.git

diff --git a/palacios/src/palacios/vmm_msr.c b/palacios/src/palacios/vmm_msr.c
index 3b13f6b..68d4767 100644
--- a/palacios/src/palacios/vmm_msr.c
+++ b/palacios/src/palacios/vmm_msr.c
@@ -22,6 +22,7 @@
 #include <palacios/vmm.h>
 #include <palacios/vm_guest.h>
 
+static int free_hook(struct v3_vm_info * vm, struct v3_msr_hook * hook);
 
 void v3_init_msr_map(struct v3_vm_info * vm) {
     struct v3_msr_map * msr_map  = &(vm->msr_map);
@@ -35,8 +36,19 @@ void v3_init_msr_map(struct v3_vm_info * vm) {
     msr_map->update_map = NULL;
 }
 
+int v3_deinit_msr_map(struct v3_vm_info * vm) {
+    struct v3_msr_hook * hook = NULL;
+    struct v3_msr_hook * tmp = NULL;
+
+    list_for_each_entry_safe(hook, tmp, &(vm->msr_map.hook_list), link) {
+	free_hook(vm, hook);
+    }
+
+    return 0;
+}
+
 int v3_handle_msr_write(struct guest_info * info) {
-    uint_t msr_num = info->vm_regs.rcx;
+    uint32_t msr_num = info->vm_regs.rcx;
     struct v3_msr msr_val;
     struct v3_msr_hook * hook = NULL;
 
@@ -65,14 +77,14 @@ int v3_handle_msr_write(struct guest_info * info) {
 
 
 int v3_handle_msr_read(struct guest_info * info) {
-    uint_t msr_num = info->vm_regs.rcx;
+    uint32_t msr_num = info->vm_regs.rcx;
     struct v3_msr msr_val;
     struct v3_msr_hook * hook = NULL;
 
     hook = v3_get_msr_hook(info->vm_info, msr_num);
 
     if (!hook) {
-        PrintError("Hook for MSR read %d not found\n", msr_num);
+        PrintError("Hook for MSR read 0x%x not found\n", msr_num);
         return -1;
     }
 
@@ -90,9 +102,9 @@ int v3_handle_msr_read(struct guest_info * info) {
     return 0;
 }
 
-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),
+int v3_hook_msr(struct v3_vm_info * vm, uint32_t msr, 
+		int (*read)(struct guest_info * core, uint32_t msr, struct v3_msr * dst, void * priv_data),
+		int (*write)(struct guest_info * core, uint32_t msr, struct v3_msr src, void * priv_data),
 		void * priv_data) {
 
     struct v3_msr_map * msr_map = &(vm->msr_map);
@@ -101,7 +113,7 @@ int v3_hook_msr(struct v3_vm_info * vm, uint_t msr,
     hook = (struct v3_msr_hook *)V3_Malloc(sizeof(struct v3_msr_hook));
 
     if (hook == NULL) {
-	PrintError("Could not allocate msr hook for MSR %d\n", msr);
+	PrintError("Could not allocate msr hook for MSR 0x%x\n", msr);
 	return -1;
     }
 
@@ -123,8 +135,20 @@ int v3_hook_msr(struct v3_vm_info * vm, uint_t msr,
     return 0;
 }
 
+static int free_hook(struct v3_vm_info * vm, struct v3_msr_hook * hook) {
+    list_del(&(hook->link));
+
+    if (vm->msr_map.update_map) {
+	vm->msr_map.update_map(vm, hook->msr, 0, 0);
+    }
 
-int v3_unhook_msr(struct v3_vm_info * vm, uint_t msr) {
+    V3_Free(hook);
+
+    return 0;
+}
+
+
+int v3_unhook_msr(struct v3_vm_info * vm, uint32_t msr) {
     struct v3_msr_hook * hook = v3_get_msr_hook(vm, msr);
 
     if (hook == NULL) {
@@ -132,20 +156,14 @@ int v3_unhook_msr(struct v3_vm_info * vm, uint_t msr) {
 	return -1;
     }
 
-    list_del(&(hook->link));
-
-    if (vm->msr_map.update_map) {
-	vm->msr_map.update_map(vm, msr, 0, 0);
-    }
-
-    V3_Free(hook);
+    free_hook(vm, hook);
 
     return 0;
 }
 
 
 
-struct v3_msr_hook * v3_get_msr_hook(struct v3_vm_info * vm, uint_t msr) {
+struct v3_msr_hook * v3_get_msr_hook(struct v3_vm_info * vm, uint32_t msr) {
     struct v3_msr_map * msr_map = &(vm->msr_map);
     struct v3_msr_hook * hook = NULL;
 
@@ -169,7 +187,7 @@ void v3_refresh_msr_map(struct v3_vm_info * vm) {
     }
 
     list_for_each_entry(hook, &(msr_map->hook_list), link) {
-	PrintDebug("updating MSR map for msr %d\n", hook->msr);
+	PrintDebug("updating MSR map for msr 0x%x\n", hook->msr);
 	msr_map->update_map(vm, hook->msr, 	
 			    (hook->read == NULL) ? 0 : 1,
 			    (hook->write == NULL) ? 0 : 1);