X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm_msr.c;h=bdc8569282393858a684cda8556cd430cb2e97cb;hb=4931bc084ced4bcb172c7bcb197ab55b1c9bdf80;hp=b90f4a0ef54c324a2f1d67debca589ddb1d17499;hpb=3ed24775c0c85bf022a57bf3b194c68b594e4a37;p=palacios.git

diff --git a/palacios/src/palacios/svm_msr.c b/palacios/src/palacios/svm_msr.c
index b90f4a0..bdc8569 100644
--- a/palacios/src/palacios/svm_msr.c
+++ b/palacios/src/palacios/svm_msr.c
@@ -47,7 +47,7 @@ static int get_bitmap_index(uint_t msr) {
 	       (msr <= AMD_7_8_GEN_MSRS_END)) {
 	return (AMD_7_8_GEN_MSRS_INDEX + (msr - AMD_7_8_GEN_MSRS_START));
     } else {
-	PrintError("MSR out of range (MSR=0x%x)\n", msr);
+	PrintError(VM_NONE, VCORE_NONE,  "MSR out of range (MSR=0x%x)\n", msr);
 	return -1;
     }
 }
@@ -62,7 +62,7 @@ static int update_map(struct v3_vm_info * vm, uint_t msr, int hook_reads, int ho
     uint8_t * bitmap = (uint8_t *)(vm->msr_map.arch_data);
 
     if (index == -1) {
-	PrintError("MSR (0x%x) out of bitmap range\n", msr);
+	PrintError(vm, VCORE_NONE,  "MSR (0x%x) out of bitmap range\n", msr);
 	return 0;
     }
 
@@ -82,11 +82,20 @@ static int update_map(struct v3_vm_info * vm, uint_t msr, int hook_reads, int ho
 
 
 int v3_init_svm_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(2));  
+    temp = V3_AllocPages(2); // need not be shadow-safe, not exposed to guest
+    
+    if (!temp) { 
+	PrintError(vm, VCORE_NONE,  "Cannot allocate msr bitmap\n");
+	return -1;
+    }
+
+    msr_map->arch_data = V3_VAddr(temp);
+
     memset(msr_map->arch_data, 0xff, PAGE_SIZE_4KB * 2);
 
     v3_refresh_msr_map(vm);
@@ -95,6 +104,8 @@ int v3_init_svm_msr_map(struct v3_vm_info * vm) {
 }
 
 int v3_deinit_svm_msr_map(struct v3_vm_info * vm) {
-    V3_FreePages(V3_PAddr(vm->msr_map.arch_data), 2);
+    if (vm->msr_map.arch_data) { 
+	V3_FreePages(V3_PAddr(vm->msr_map.arch_data), 2);
+    }
     return 0;
 }