From: Jack Lange <jacklange@cs.pitt.edu>
Date: Wed, 21 Dec 2011 21:28:58 +0000 (-0500)
Subject: data type fixes
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=commitdiff_plain;h=3ed24775c0c85bf022a57bf3b194c68b594e4a37;p=palacios.releases.git

data type fixes
---

diff --git a/palacios/src/palacios/svm_msr.c b/palacios/src/palacios/svm_msr.c
index 2ffcfac..b90f4a0 100644
--- 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;
     }
 
diff --git a/palacios/src/palacios/vmm_msr.c b/palacios/src/palacios/vmm_msr.c
index bd682a6..b960187 100644
--- a/palacios/src/palacios/vmm_msr.c
+++ b/palacios/src/palacios/vmm_msr.c
@@ -109,7 +109,9 @@ int v3_handle_msr_read(struct guest_info * info) {
 
 int v3_msr_unhandled_read(struct guest_info * core, uint32_t msr, struct v3_msr * dst, void * priv_data) {
     V3_Print("Palacios: Unhandled MSR Read (MSR=0x%x) - returning zero\n", msr);
-    dst->lo=dst->hi=0;
+
+    dst->value = 0;
+
     // should produce GPF for unsupported msr
     return 0;
 }