X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm_msr.c;fp=palacios%2Fsrc%2Fpalacios%2Fsvm_msr.c;h=ee14a14e4fd84adcc0f6d4988de2ff9c29d12006;hb=266af4b5b19da7bee8e7445288c7c1cb3ee194c7;hp=bd16fb2024acee8ba2f47e344db46f925cc905e1;hpb=5ac47589b79508967bd06b4022bbfc50de47423f;p=palacios.git

diff --git a/palacios/src/palacios/svm_msr.c b/palacios/src/palacios/svm_msr.c
index bd16fb2..ee14a14 100644
--- a/palacios/src/palacios/svm_msr.c
+++ b/palacios/src/palacios/svm_msr.c
@@ -37,105 +37,105 @@
 
 
 static int get_bitmap_index(uint_t msr) {
-  if ((msr >= PENTIUM_MSRS_START) && 
-      (msr <= PENTIUM_MSRS_END)) {
-    return (PENTIUM_MSRS_INDEX + (msr - PENTIUM_MSRS_START));
-  } else if ((msr >= AMD_6_GEN_MSRS_START) && 
-	     (msr <= AMD_6_GEN_MSRS_END)) {
-    return (AMD_6_GEN_MSRS_INDEX + (msr - AMD_6_GEN_MSRS_START));
-  } else if ((msr >= AMD_7_8_GEN_MSRS_START) && 
-	     (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);
-    return -1;
-  }
+    if ((msr >= PENTIUM_MSRS_START) && 
+	(msr <= PENTIUM_MSRS_END)) {
+	return (PENTIUM_MSRS_INDEX + (msr - PENTIUM_MSRS_START));
+    } else if ((msr >= AMD_6_GEN_MSRS_START) && 
+	       (msr <= AMD_6_GEN_MSRS_END)) {
+	return (AMD_6_GEN_MSRS_INDEX + (msr - AMD_6_GEN_MSRS_START));
+    } else if ((msr >= AMD_7_8_GEN_MSRS_START) && 
+	       (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);
+	return -1;
+    }
 }
 
 
 
 addr_t v3_init_svm_msr_map(struct guest_info * info) {
-  uchar_t * msr_bitmap = (uchar_t*)V3_VAddr(V3_AllocPages(2));
-  struct v3_msr_map * msr_map = &(info->msr_map);
-  struct v3_msr_hook * hook = NULL;
+    uchar_t * msr_bitmap = (uchar_t*)V3_VAddr(V3_AllocPages(2));
+    struct v3_msr_map * msr_map = &(info->msr_map);
+    struct v3_msr_hook * hook = NULL;
   
   
-  memset(msr_bitmap, 0, PAGE_SIZE * 2);
+    memset(msr_bitmap, 0, PAGE_SIZE * 2);
 
-  list_for_each_entry(hook, &(msr_map->hook_list), link) {
-    int index = get_bitmap_index(hook->msr);
-    uint_t byte_offset = index / 4;
-    uint_t bit_offset = (index % 4) * 2;
-    uchar_t val = 0;
-    uchar_t mask = ~0x3;
+    list_for_each_entry(hook, &(msr_map->hook_list), link) {
+	int index = get_bitmap_index(hook->msr);
+	uint_t byte_offset = index / 4;
+	uint_t bit_offset = (index % 4) * 2;
+	uchar_t val = 0;
+	uchar_t mask = ~0x3;
 
-    if (hook->read) {
-      val |= 0x1;
-    } 
+	if (hook->read) {
+	    val |= 0x1;
+	} 
 
-    if (hook->write) {
-      val |= 0x2;
-    }
+	if (hook->write) {
+	    val |= 0x2;
+	}
 
-    val = val << bit_offset;
-    mask = mask << bit_offset;
+	val = val << bit_offset;
+	mask = mask << bit_offset;
 
-    *(msr_bitmap + byte_offset) &= mask;
-    *(msr_bitmap + byte_offset) |= val;
-  }
+	*(msr_bitmap + byte_offset) &= mask;
+	*(msr_bitmap + byte_offset) |= val;
+    }
 
-  return (addr_t)V3_PAddr(msr_bitmap);
+    return (addr_t)V3_PAddr(msr_bitmap);
 }
 
 
 
 int v3_handle_msr_write(struct guest_info * info) {
-  uint_t msr_num = info->vm_regs.rcx;
-  struct v3_msr msr_val;
-  struct v3_msr_hook * hook = NULL;
+    uint_t msr_num = info->vm_regs.rcx;
+    struct v3_msr msr_val;
+    struct v3_msr_hook * hook = NULL;
 
-  hook = v3_get_msr_hook(info, msr_num);
+    hook = v3_get_msr_hook(info, msr_num);
 
-  if (!hook) {
-    PrintError("Hook for MSR write %d not found\n", msr_num);
-    return -1;
-  }
+    if (!hook) {
+	PrintError("Hook for MSR write %d not found\n", msr_num);
+	return -1;
+    }
 
-  msr_val.value = 0;
-  msr_val.lo = info->vm_regs.rax;
-  msr_val.hi = info->vm_regs.rdx;
+    msr_val.value = 0;
+    msr_val.lo = info->vm_regs.rax;
+    msr_val.hi = info->vm_regs.rdx;
 
-  if (hook->write(msr_num, msr_val, hook->priv_data) == -1) {
-    PrintError("Error in MSR hook Write\n");
-    return -1;
-  }
+    if (hook->write(msr_num, msr_val, hook->priv_data) == -1) {
+	PrintError("Error in MSR hook Write\n");
+	return -1;
+    }
 
-  return 0;
+    return 0;
 }
 
 
 
 int v3_handle_msr_read(struct guest_info * info) {
-  uint_t msr_num = info->vm_regs.rcx;
-  struct v3_msr msr_val;
-  struct v3_msr_hook * hook = NULL;
+    uint_t msr_num = info->vm_regs.rcx;
+    struct v3_msr msr_val;
+    struct v3_msr_hook * hook = NULL;
 
-  hook = v3_get_msr_hook(info, msr_num);
+    hook = v3_get_msr_hook(info, msr_num);
 
-  if (!hook) {
-    PrintError("Hook for MSR read %d not found\n", msr_num);
-    return -1;
-  }
+    if (!hook) {
+	PrintError("Hook for MSR read %d not found\n", msr_num);
+	return -1;
+    }
 
-  msr_val.value = 0;
+    msr_val.value = 0;
   
-  if (hook->read(msr_num, &msr_val, hook->priv_data) == -1) {
-    PrintError("Error in MSR hook Read\n");
-    return -1;
-  }
+    if (hook->read(msr_num, &msr_val, hook->priv_data) == -1) {
+	PrintError("Error in MSR hook Read\n");
+	return -1;
+    }
 
-  info->vm_regs.rax = msr_val.lo;
-  info->vm_regs.rdx = msr_val.hi;
+    info->vm_regs.rax = msr_val.lo;
+    info->vm_regs.rdx = msr_val.hi;
   
-  return 0;
+    return 0;
 }