X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmx_handler.c;h=5af3122c84f432abe2e6579a61294bc14e3eb594;hb=cf780b903a02efc700d51dbadcc90115f016256c;hp=71c1eabbc69d7c0a15e0bfc39105175e84fe5c66;hpb=94f67717b6461df514dc225ed84f03b44c44061b;p=palacios.releases.git

diff --git a/palacios/src/palacios/vmx_handler.c b/palacios/src/palacios/vmx_handler.c
index 71c1eab..5af3122 100644
--- a/palacios/src/palacios/vmx_handler.c
+++ b/palacios/src/palacios/vmx_handler.c
@@ -224,12 +224,22 @@ int v3_handle_vmx_exit(struct guest_info * info, struct vmx_exit_info * exit_inf
 			return -1;
 		    }
 		    break;
+		case 4:
+		    //PrintDebug("Handling CR4 Access\n");
+		    if (v3_vmx_handle_cr4_access(info, cr_qual) == -1) {
+			PrintError("Error in CR4 access handler\n");
+			return -1;
+		    }
+		    break;
 		default:
 		    PrintError("Unhandled CR access: %d\n", cr_qual->cr_id);
 		    return -1;
 	    }
 	    
-	    info->rip += exit_info->instr_len;
+	    // TODO: move RIP increment into all of the above individual CR
+	    //       handlers, not just v3_vmx_handle_cr4_access()
+	    if (cr_qual->cr_id != 4)
+		info->rip += exit_info->instr_len;
 
 	    break;
 	}