X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm_msr.c;h=b90f4a0ef54c324a2f1d67debca589ddb1d17499;hb=1c000bda0560742ad6be011722fa226771b656ff;hp=dabe82d206df4336b773a074baad9dcfc8d97a57;hpb=123a1ba27ea09c8fa77a1b36ce625b43d7c48b14;p=palacios.git

diff --git a/palacios/src/palacios/svm_msr.c b/palacios/src/palacios/svm_msr.c
index dabe82d..b90f4a0 100644
--- a/palacios/src/palacios/svm_msr.c
+++ b/palacios/src/palacios/svm_msr.c
@@ -53,19 +53,24 @@ static int get_bitmap_index(uint_t msr) {
 }
 
 
-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 / 4;
     uint_t minor = (index % 4) * 2;
-    uchar_t val = 0;
-    uchar_t mask = 0x3;
-    uint8_t * bitmap = (uint8_t *)(info->msr_map.arch_data);
+    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;
     }
 
@@ -76,17 +81,20 @@ static int update_map(struct guest_info * info, uint_t msr, int hook_reads, int
 }
 
 
-int v3_init_svm_msr_map(struct guest_info * info) {
-    struct v3_msr_map * msr_map = &(info->msr_map);
+int v3_init_svm_msr_map(struct v3_vm_info * vm) {
+    struct v3_msr_map * msr_map = &(vm->msr_map);
   
     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(info);
+    v3_refresh_msr_map(vm);
 
     return 0;
 }
 
-
+int v3_deinit_svm_msr_map(struct v3_vm_info * vm) {
+    V3_FreePages(V3_PAddr(vm->msr_map.arch_data), 2);
+    return 0;
+}