X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmx_msr.c;h=f470c37d90198fd4e26aae7e406d1f55cc8e1d23;hb=5e5c8ee949fa45116d58b904fc11aab082f61607;hp=66995ac8db2922339e6dc62619668701424f7b8c;hpb=cfcceed5890430afedcc544bd7dbb69e29dfd65a;p=palacios.git

diff --git a/palacios/src/palacios/vmx_msr.c b/palacios/src/palacios/vmx_msr.c
index 66995ac..f470c37 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;
@@ -42,34 +42,38 @@ static int get_bitmap_index(uint_t msr)
 }
 
 /* Same as SVM */
-static int update_map(struct guest_info * info, uint_t msr, int hook_reads, int hook_writes) {
-
+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);
     uchar_t mask = 0x1;
     uint8_t read_val = (hook_reads) ? 0x1 : 0x0;
     uint8_t write_val = (hook_writes) ? 0x1 : 0x0;
-    uint8_t * bitmap = (uint8_t *)(info->msr_map.arch_data);
-
+    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;
 }
 
-int v3_init_vmx_msr_map(struct guest_info * info) {
-   struct v3_msr_map * msr_map = &(info->msr_map);
+int v3_init_vmx_msr_map(struct v3_vm_info * vm) {
+    struct v3_msr_map * msr_map = &(vm->msr_map);
 
-   msr_map->update_map = update_map;
-   
-   msr_map->arch_data = V3_VAddr(V3_AllocPages(1));
-   memset(msr_map->arch_data, 0, PAGE_SIZE_4KB);
+    msr_map->update_map = update_map;
+    
+    msr_map->arch_data = V3_VAddr(V3_AllocPages(1));
+    memset(msr_map->arch_data, 0xff, PAGE_SIZE_4KB);
+    
+    v3_refresh_msr_map(vm);
+    
+    return 0;
+}
 
-   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;
 }