X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_msr.c;h=68d476746b60ab670c23357c61a012bb52bea43a;hb=adee0fafaa51f4bf28abe7461006be9b9d3dbceb;hp=de68a86d1df4ea0d86e3eb644db2526ce68e256e;hpb=ed8feff1d5dd6bf028cd5ba0960ec125505d7597;p=palacios.git

diff --git a/palacios/src/palacios/vmm_msr.c b/palacios/src/palacios/vmm_msr.c
index de68a86..68d4767 100644
--- a/palacios/src/palacios/vmm_msr.c
+++ b/palacios/src/palacios/vmm_msr.c
@@ -22,9 +22,12 @@
 #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 guest_info * info) {
-    struct v3_msr_map * msr_map  = &(info->msr_map);
+void v3_init_msr_map(struct v3_vm_info * vm) {
+    struct v3_msr_map * msr_map  = &(vm->msr_map);
+
+    PrintDebug("Initializing MSR map.\n");
 
     INIT_LIST_HEAD(&(msr_map->hook_list));
     msr_map->num_hooks = 0;
@@ -33,14 +36,25 @@ void v3_init_msr_map(struct guest_info * info) {
     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;
 
     PrintDebug("MSR write for msr 0x%x\n", msr_num);
 
-    hook = v3_get_msr_hook(info, msr_num);
+    hook = v3_get_msr_hook(info->vm_info, msr_num);
 
     if (!hook) {
         PrintError("Hook for MSR write %d not found\n", msr_num);
@@ -51,7 +65,7 @@ int v3_handle_msr_write(struct guest_info * info) {
     msr_val.lo = info->vm_regs.rax;
     msr_val.hi = info->vm_regs.rdx;
 
-    if (hook->write(msr_num, msr_val, hook->priv_data) == -1) {
+    if (hook->write(info, msr_num, msr_val, hook->priv_data) == -1) {
         PrintError("Error in MSR hook Write\n");
         return -1;
     }
@@ -63,20 +77,20 @@ 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, msr_num);
+    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;
     }
 
     msr_val.value = 0;
 
-    if (hook->read(msr_num, &msr_val, hook->priv_data) == -1) {
+    if (hook->read(info, msr_num, &msr_val, hook->priv_data) == -1) {
         PrintError("Error in MSR hook Read\n");
         return -1;
     }
@@ -88,18 +102,18 @@ int v3_handle_msr_read(struct guest_info * info) {
     return 0;
 }
 
-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, 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 = &(info->msr_map);
+    struct v3_msr_map * msr_map = &(vm->msr_map);
     struct v3_msr_hook * hook = NULL;
 
     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;
     }
 
@@ -113,7 +127,7 @@ int v3_hook_msr(struct guest_info * info, uint_t msr,
     list_add(&(hook->link), &(msr_map->hook_list));
 
     if (msr_map->update_map) {
-	msr_map->update_map(info, msr, 
+	msr_map->update_map(vm, msr, 
 			    (read == NULL) ? 0 : 1,
 			    (write == NULL) ? 0 : 1);
     }
@@ -121,16 +135,36 @@ int v3_hook_msr(struct guest_info * info, 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);
+    }
+
+    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);
 
-int v3_unhook_msr(struct guest_info * info, uint_t msr) {
-    PrintError("Unhooking MSRs currently not supported\n");
-    return -1;
+    if (hook == NULL) {
+	PrintError("Could not find MSR to unhook %u (0x%x)\n", msr, msr);
+	return -1;
+    }
+
+    free_hook(vm, hook);
+
+    return 0;
 }
 
 
 
-struct v3_msr_hook * v3_get_msr_hook(struct guest_info * info, uint_t msr) {
-    struct v3_msr_map * msr_map = &(info->msr_map);
+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;
 
     list_for_each_entry(hook, &(msr_map->hook_list), link) {
@@ -143,8 +177,8 @@ struct v3_msr_hook * v3_get_msr_hook(struct guest_info * info, uint_t msr) {
 }
 
 
-void v3_refresh_msr_map(struct guest_info * info) {
-    struct v3_msr_map * msr_map = &(info->msr_map);
+void v3_refresh_msr_map(struct v3_vm_info * vm) {
+    struct v3_msr_map * msr_map = &(vm->msr_map);
     struct v3_msr_hook * hook = NULL;
 
     if (msr_map->update_map == NULL) {
@@ -153,15 +187,15 @@ void v3_refresh_msr_map(struct guest_info * info) {
     }
 
     list_for_each_entry(hook, &(msr_map->hook_list), link) {
-	PrintDebug("updating MSR map for msr %d\n", hook->msr);
-	msr_map->update_map(info, 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);
     }
 }
 
-void v3_print_msr_map(struct guest_info * info) {
-    struct v3_msr_map * msr_map = &(info->msr_map);
+void v3_print_msr_map(struct v3_vm_info * vm) {
+    struct v3_msr_map * msr_map = &(vm->msr_map);
     struct v3_msr_hook * hook = NULL;
 
     list_for_each_entry(hook, &(msr_map->hook_list), link) {