X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm_msr.c;h=345ab1aac9445d0d5ec97f30d99f49bc34bfac76;hb=926fe574cd42bb860c19fd04610451c24b6d42b6;hp=82614f128e68dc3d411da636ea5b2f46e9a20148;hpb=ed8feff1d5dd6bf028cd5ba0960ec125505d7597;p=palacios.git

diff --git a/palacios/src/palacios/svm_msr.c b/palacios/src/palacios/svm_msr.c
index 82614f1..345ab1a 100644
--- a/palacios/src/palacios/svm_msr.c
+++ b/palacios/src/palacios/svm_msr.c
@@ -21,7 +21,7 @@
 #include <palacios/vmm_msr.h>
 #include <palacios/vmm_sprintf.h>
 #include <palacios/vmm_list.h>
-
+#include <palacios/vm_guest.h>
 
 #define PENTIUM_MSRS_START            0x00000000
 #define PENTIUM_MSRS_END              0x00001fff
@@ -53,13 +53,13 @@ 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 * bitmap = (uint8_t *)(vm->msr_map.arch_data);
 
     if (hook_reads) {
 	val |= 0x1;
@@ -76,17 +76,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);
 
-    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;
+}