From: Peter Dinda <pdinda@northwestern.edu>
Date: Thu, 16 Jun 2011 17:56:21 +0000 (-0500)
Subject: Merge branch 'devel' of palacios@newskysaw.cs.northwestern.edu:/home/palacios/palacio... 
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=commitdiff_plain;h=3de2fb2103ceb8bb1837aa1432a18ff976880dbc

Merge branch 'devel' of palacios@newskysaw.cs.northwestern.edu:/home/palacios/palacios into devel

Conflicts:

	palacios/src/palacios/svm.c
---

3de2fb2103ceb8bb1837aa1432a18ff976880dbc
diff --cc palacios/src/palacios/svm.c
index 51901e3,7d7b43c..03a99f5
--- a/palacios/src/palacios/svm.c
+++ b/palacios/src/palacios/svm.c
@@@ -571,15 -569,10 +569,18 @@@ int v3_svm_enter(struct guest_info * in
      // Conditionally yield the CPU if the timeslice has expired
      v3_yield_cond(info);
  
- 
 +    {
 +	int ret = v3_handle_svm_exit(info, exit_code, exit_info1, exit_info2);
 +	
 +	if (ret != 0) {
 +	    PrintError("Error in SVM exit handler (ret=%d)\n", ret);
 +	    PrintError("  last Exit was %d (exit code=0x%llx)\n", v3_last_exit, (uint64_t) exit_code);
 +	    return -1;
 +	}
+     if (v3_handle_svm_exit(info, exit_code, exit_info1, exit_info2) != 0) {
+ 	PrintError("Error in SVM exit handler\n");
+ 	PrintError("  last exit was %d\n", v3_last_exit);
+ 	return -1;
      }