bug fixes for VMX

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

diff --git a/palacios/src/palacios/svm_msr.c b/palacios/src/palacios/svm_msr.c
index 345ab1a..b90f4a0 100644 (file)
--- a/palacios/src/palacios/svm_msr.c
+++ b/palacios/src/palacios/svm_msr.c
@@ -57,15 +57,20 @@ static int update_map(struct v3_vm_info * vm, uint_t msr, int hook_reads, int ho
     int index = get_bitmap_index(msr);
     uint_t major = index / 4;
     uint_t minor = (index % 4) * 2;
-    uchar_t val = 0;
-    uchar_t mask = 0x3;
+    uint8_t val = 0;
+    uint8_t mask = 0x3;
     uint8_t * bitmap = (uint8_t *)(vm->msr_map.arch_data);
 
-    if (hook_reads) {
+    if (index == -1) {
+       PrintError("MSR (0x%x) out of bitmap range\n", msr);
+       return 0;
+    }
+
+    if (hook_reads != 0) {
        val |= 0x1;
     } 
     
-    if (hook_writes) {
+    if (hook_writes != 0) {
        val |= 0x2;
     }
 
@@ -82,7 +87,7 @@ int v3_init_svm_msr_map(struct v3_vm_info * vm) {
     msr_map->update_map = update_map;
 
     msr_map->arch_data = V3_VAddr(V3_AllocPages(2));  
-    memset(msr_map->arch_data, 0, PAGE_SIZE_4KB * 2);
+    memset(msr_map->arch_data, 0xff, PAGE_SIZE_4KB * 2);
 
     v3_refresh_msr_map(vm);