Context-based output infrastructure (V3_Print, etc) and modifications to use it

[palacios.git] / palacios / src / palacios / vmx_msr.c

diff --git a/palacios/src/palacios/vmx_msr.c b/palacios/src/palacios/vmx_msr.c
index bf0e79f..9d6e42a 100644 (file)
--- a/palacios/src/palacios/vmx_msr.c
+++ b/palacios/src/palacios/vmx_msr.c
@@ -34,16 +34,15 @@ 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);
+        PrintError(VM_NONE, VCORE_NONE,  "MSR out of range: 0x%x\n", msr);
         return -1;
     }
 }
 
 /* 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,24 +51,35 @@ 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);
 
+    if (index == -1) {
+       //      0rintError("Error updating MSR Map failed bitmap index for (0x%x)\n", msr);
+       // MSRs not in the bitmap covered range will always trigger exits, so we don't need to worry about them here.
+       return 0;
+    }
 
     *(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 v3_vm_info * vm) {
+    void *temp;
+
     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);
+    temp = V3_AllocPages(1);
+    if (!temp) { 
+        PrintError(vm, VCORE_NONE, "Cannot allocat MSR bitmap\n");
+       return -1;
+    }
+    msr_map->arch_data = V3_VAddr(temp);
+    memset(msr_map->arch_data, 0xff, PAGE_SIZE_4KB);
     
     v3_refresh_msr_map(vm);