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 ae64331..9d6e42a 100644 (file)
--- a/palacios/src/palacios/vmx_msr.c
+++ b/palacios/src/palacios/vmx_msr.c
@@ -36,7 +36,7 @@ static int get_bitmap_index(uint_t msr)
     } else if (( msr >= HIGH_MSR_START ) && (msr <= HIGH_MSR_END)) {
         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;
     }
 }
@@ -67,11 +67,18 @@ static int update_map(struct v3_vm_info * vm, uint_t msr, int hook_reads, int ho
 }
 
 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));
+    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);