X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmx_msr.c;h=18bb3ee5cfee8e157291d89185c7517b9c43c7ea;hb=198151f1d58834ff7889389007232a3d250f51f1;hp=2d9df85dbaa2f8f63c994c13527d893abedc8f5a;hpb=c3714b74821dffe63b2fdcf10d8fe614c5ac9bb1;p=palacios.git

diff --git a/palacios/src/palacios/vmx_msr.c b/palacios/src/palacios/vmx_msr.c
index 2d9df85..18bb3ee 100644
--- a/palacios/src/palacios/vmx_msr.c
+++ b/palacios/src/palacios/vmx_msr.c
@@ -31,47 +31,63 @@
 
 static int get_bitmap_index(uint_t msr)
 {
+    // unsigned comparison with 0 here for clarity
     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 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);
 
+    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 guest_info * info) {
-    struct v3_msr_map * msr_map = &(info->msr_map);
+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); // 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(info);
+    v3_refresh_msr_map(vm);
     
     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;
+}