bug fixes for VMX

[palacios.git] / palacios / src / palacios / vmm_msr.c

diff --git a/palacios/src/palacios/vmm_msr.c b/palacios/src/palacios/vmm_msr.c
index 4163145..b960187 100644 (file)
--- a/palacios/src/palacios/vmm_msr.c
+++ b/palacios/src/palacios/vmm_msr.c
@@ -64,9 +64,13 @@ int v3_handle_msr_write(struct guest_info * info) {
        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->write) {
+           if (hook->write(info, msr_num, msr_val, hook->priv_data) == -1) {
+               PrintError("Error in MSR hook Write\n");
+               return -1;
+           }
+       } else {
+           PrintError("No write hook exists for msr 0x%x\n",msr_num);
        }
     }
 
@@ -105,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;
 }