X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_msr.c;h=4163145c795ab34de7b1970dd3fa9c2ddfdf25ea;hb=639f3d3bd42dd2218bcd994e423f3a5569ed7051;hp=68d476746b60ab670c23357c61a012bb52bea43a;hpb=912f74aae257be698044de894124289ba5356621;p=palacios.git

diff --git a/palacios/src/palacios/vmm_msr.c b/palacios/src/palacios/vmm_msr.c
index 68d4767..4163145 100644
--- a/palacios/src/palacios/vmm_msr.c
+++ b/palacios/src/palacios/vmm_msr.c
@@ -51,23 +51,23 @@ int v3_handle_msr_write(struct guest_info * info) {
     uint32_t msr_num = info->vm_regs.rcx;
     struct v3_msr msr_val;
     struct v3_msr_hook * hook = NULL;
+    
+    msr_val.value = 0;
 
     PrintDebug("MSR write for msr 0x%x\n", msr_num);
 
     hook = v3_get_msr_hook(info->vm_info, msr_num);
 
-    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;
-
-    if (hook->write(info, msr_num, msr_val, hook->priv_data) == -1) {
-        PrintError("Error in MSR hook Write\n");
-        return -1;
+    if (hook == NULL) {
+	v3_msr_unhandled_write(info, msr_num, msr_val, NULL);
+    } else {
+	msr_val.lo = info->vm_regs.rax;
+	msr_val.hi = info->vm_regs.rdx;
+	
+	if (hook->write(info, msr_num, msr_val, hook->priv_data) == -1) {
+	    PrintError("Error in MSR hook Write\n");
+	    return -1;
+	}
     }
 
     info->rip += 2;
@@ -81,20 +81,19 @@ int v3_handle_msr_read(struct guest_info * info) {
     struct v3_msr msr_val;
     struct v3_msr_hook * hook = NULL;
 
-    hook = v3_get_msr_hook(info->vm_info, msr_num);
-
-    if (!hook) {
-        PrintError("Hook for MSR read 0x%x not found\n", msr_num);
-        return -1;
-    }
-
     msr_val.value = 0;
 
-    if (hook->read(info, msr_num, &msr_val, hook->priv_data) == -1) {
-        PrintError("Error in MSR hook Read\n");
-        return -1;
+    hook = v3_get_msr_hook(info->vm_info, msr_num);
+    
+    if (hook == NULL) {
+	v3_msr_unhandled_read(info, msr_num, &msr_val, NULL);
+    } else {
+	if (hook->read(info, 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;
 
@@ -102,6 +101,22 @@ int v3_handle_msr_read(struct guest_info * info) {
     return 0;
 }
 
+
+
+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;
+    // should produce GPF for unsupported msr
+    return 0;
+}
+
+int v3_msr_unhandled_write(struct guest_info * core, uint32_t msr, struct v3_msr src, void * priv_data) {
+    V3_Print("Palacios: Unhandled MSR Write (MSR=0x%x) - ignored\n", msr);
+    // should produce GPF for unsupported msr
+    return 0;
+}
+
+
 int v3_hook_msr(struct v3_vm_info * vm, uint32_t msr, 
 		int (*read)(struct guest_info * core, uint32_t msr, struct v3_msr * dst, void * priv_data),
 		int (*write)(struct guest_info * core, uint32_t msr, struct v3_msr src, void * priv_data),
@@ -135,6 +150,10 @@ int v3_hook_msr(struct v3_vm_info * vm, uint32_t msr,
     return 0;
 }
 
+
+
+
+
 static int free_hook(struct v3_vm_info * vm, struct v3_msr_hook * hook) {
     list_del(&(hook->link));