X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmx_msr.c;h=ea2037487e4ce6d02aeca8e687dc2b0e632991f7;hb=c0ecfba627c1d6c3f46d59bd4e5e6f883a494dc4;hp=ae643318fc1cb7bdfe9d7a3277a63a21707175ec;hpb=bcab692b40b809c628eb365c199ffd3c757a6cc7;p=palacios.git

diff --git a/palacios/src/palacios/vmx_msr.c b/palacios/src/palacios/vmx_msr.c
index ae64331..ea20374 100644
--- 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); // need not be shadow-safe, not exposed to guest
+    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);