X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_msr.c;h=e70b5bbc958a17939cd468f4353e6a71f2bf9674;hb=dbffa86f170230cacd9653fff0f7f783c12094e2;hp=85bc3f37b722bac90221ed993af0b8e34259b126;hpb=3e5e5a12e64630d7a37ed32b8d7e2d993c79f7e0;p=palacios.git

diff --git a/palacios/src/palacios/vmm_msr.c b/palacios/src/palacios/vmm_msr.c
index 85bc3f3..e70b5bb 100644
--- a/palacios/src/palacios/vmm_msr.c
+++ b/palacios/src/palacios/vmm_msr.c
@@ -22,10 +22,13 @@
 #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);
 
+    PrintDebug("Initializing MSR map.\n");
+
     INIT_LIST_HEAD(&(msr_map->hook_list));
     msr_map->num_hooks = 0;
 
@@ -33,6 +36,17 @@ 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;
     struct v3_msr msr_val;
@@ -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;
     }
@@ -76,7 +90,7 @@ int v3_handle_msr_read(struct guest_info * info) {
 
     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;
     }
@@ -89,8 +103,8 @@ int v3_handle_msr_read(struct guest_info * info) {
 }
 
 int v3_hook_msr(struct v3_vm_info * vm, 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) {
 
     struct v3_msr_map * msr_map = &(vm->msr_map);
@@ -121,10 +135,30 @@ 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);
+    }
+
+    V3_Free(hook);
+
+    return 0;
+}
+
 
 int v3_unhook_msr(struct v3_vm_info * vm, uint_t msr) {
-    PrintError("Unhooking MSRs currently not supported\n");
-    return -1;
+    struct v3_msr_hook * hook = v3_get_msr_hook(vm, msr);
+
+    if (hook == NULL) {
+	PrintError("Could not find MSR to unhook %u (0x%x)\n", msr, msr);
+	return -1;
+    }
+
+    free_hook(vm, hook);
+
+    return 0;
 }