X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmx_msr.c;h=e1ba86fb120736690c9fc86eb0448fedf2e5a67e;hb=81361b1fc66eb2ca2e1eb80d3c3b98c6accde9d0;hp=4368c9c8375d7a385edc5e63310a70444010771c;hpb=3e5e5a12e64630d7a37ed32b8d7e2d993c79f7e0;p=palacios.git

diff --git a/palacios/src/palacios/vmx_msr.c b/palacios/src/palacios/vmx_msr.c
index 4368c9c..e1ba86f 100644
--- a/palacios/src/palacios/vmx_msr.c
+++ b/palacios/src/palacios/vmx_msr.c
@@ -34,7 +34,7 @@ static int get_bitmap_index(uint_t msr)
     if( (msr >= LOW_MSR_START) && msr <= LOW_MSR_END) {
         return LOW_MSR_INDEX + msr;
     } else if (( msr >= HIGH_MSR_START ) && (msr <= HIGH_MSR_END)) {
-        return HIGH_MSR_INDEX + (msr - HIGH_MSR_START);
+        return (HIGH_MSR_INDEX * 8) + (msr - HIGH_MSR_START);
     } else {
         PrintError("MSR out of range: 0x%x\n", msr);
         return -1;
@@ -43,7 +43,6 @@ static int get_bitmap_index(uint_t msr)
 
 /* Same as SVM */
 static int update_map(struct v3_vm_info * vm, uint_t msr, int hook_reads, int hook_writes) {
-
     int index = get_bitmap_index(msr);
     uint_t major = index / 8;
     uint_t minor = (index % 8);
@@ -52,14 +51,12 @@ static int update_map(struct v3_vm_info * vm, uint_t msr, int hook_reads, int ho
     uint8_t write_val = (hook_writes) ? 0x1 : 0x0;
     uint8_t * bitmap = (uint8_t *)(vm->msr_map.arch_data);
 
-
     *(bitmap + major) &= ~(mask << minor);
     *(bitmap + major) |= (read_val << minor);
-    
 
     *(bitmap + 2048 + major) &= ~(mask << minor);
     *(bitmap + 2048 + major) |= (write_val << minor);
-    
+
     return 0;
 }
 
@@ -75,3 +72,8 @@ int v3_init_vmx_msr_map(struct v3_vm_info * vm) {
     
     return 0;
 }
+
+int v3_deinit_vmx_msr_map(struct v3_vm_info * vm) {
+    V3_FreePages(V3_PAddr(vm->msr_map.arch_data), 1);
+    return 0;
+}