X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_msr.c;h=99ebf15ec7e61e7c503477930ca4935185c5f4e5;hb=8a441df14ef65bb559ce090249343ec1dac1a7fc;hp=105bfe6b1fcc1437c6a2b563718fa278452c07bf;hpb=266af4b5b19da7bee8e7445288c7c1cb3ee194c7;p=palacios.git

diff --git a/palacios/src/palacios/vmm_msr.c b/palacios/src/palacios/vmm_msr.c
index 105bfe6..99ebf15 100644
--- a/palacios/src/palacios/vmm_msr.c
+++ b/palacios/src/palacios/vmm_msr.c
@@ -28,9 +28,64 @@ void v3_init_msr_map(struct guest_info * info) {
 
     INIT_LIST_HEAD(&(msr_map->hook_list));
     msr_map->num_hooks = 0;
+
+    msr_map->arch_data = NULL;
+    msr_map->update_map = NULL;
+}
+
+int v3_handle_msr_write(struct guest_info * info) {
+    uint_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);
+
+    if (!hook) {
+        PrintError("Hook for MSR write %d not found\n", msr_num);
+        return -1;
+    }
+
+    msr_val.value = 0;
+    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) {
+        PrintError("Error in MSR hook Write\n");
+        return -1;
+    }
+
+    info->rip += 2;
+
+    return 0;
 }
 
 
+int v3_handle_msr_read(struct guest_info * info) {
+    uint_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);
+
+    if (!hook) {
+        PrintError("Hook for MSR read %d not found\n", msr_num);
+        return -1;
+    }
+
+    msr_val.value = 0;
+
+    if (hook->read(msr_num, &msr_val, hook->priv_data) == -1) {
+        PrintError("Error in MSR hook Read\n");
+        return -1;
+    }
+
+    info->vm_regs.rax = msr_val.lo;
+    info->vm_regs.rdx = msr_val.hi;
+
+    info->rip += 2;
+    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),
@@ -40,6 +95,7 @@ int v3_hook_msr(struct guest_info * info, uint_t msr,
     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);
 	return -1;
@@ -54,6 +110,9 @@ int v3_hook_msr(struct guest_info * info, uint_t msr,
 
     list_add(&(hook->link), &(msr_map->hook_list));
 
+    msr_map->update_map(info, msr, 
+			(read == NULL) ? 0 : 1,
+			(write == NULL) ? 0 : 1);
     return 0;
 }