X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm.c;h=5fadae1d07c7b81457c78bfd71b36c9455eef26f;hb=e23a867d9dcecc70fc76adc0f89404dbc50e5b78;hp=c7da4a406e5a9154e71df71b1f4e2f2156ecee88;hpb=be2e1236b710115eb59f166a950f45710a15d2ef;p=palacios.git

diff --git a/palacios/src/palacios/svm.c b/palacios/src/palacios/svm.c
index c7da4a4..5fadae1 100644
--- a/palacios/src/palacios/svm.c
+++ b/palacios/src/palacios/svm.c
@@ -277,10 +277,14 @@ static int start_svm_guest(struct guest_info *info) {
     //PrintDebugVMCB((vmcb_t*)(info->vmm_data));
     
     info->run_state = VM_RUNNING;
-    
+    rdtscll(info->yield_start_cycle);
+
+
     while (1) {
 	ullong_t tmp_tsc;
 	
+	// Conditionally yield the CPU if the timeslice has expired
+	v3_yield_cond(info);
 
 	/*
 	  PrintDebug("SVM Entry to CS=%p  rip=%p...\n", 
@@ -289,6 +293,7 @@ static int start_svm_guest(struct guest_info *info) {
 	*/
 
 	// disable global interrupts for vm state transition
+
 	v3_clgi();
 
 
@@ -318,6 +323,9 @@ static int start_svm_guest(struct guest_info *info) {
 	}
 
      
+	// Conditionally yield the CPU if the timeslice has expired
+	v3_yield_cond(info);
+
 	if (v3_handle_svm_exit(info) != 0) {
 	    vmcb_ctrl_t * guest_ctrl = GET_VMCB_CTRL_AREA((vmcb_t*)(info->vmm_data));
 	    addr_t host_addr;
@@ -367,11 +375,11 @@ int v3_is_svm_capable() {
     uint_t vm_cr_low = 0, vm_cr_high = 0;
     addr_t eax = 0, ebx = 0, ecx = 0, edx = 0;
 
-    v3_cpuid(CPUID_FEATURE_IDS, &eax, &ebx, &ecx, &edx);
+    v3_cpuid(CPUID_EXT_FEATURE_IDS, &eax, &ebx, &ecx, &edx);
   
-    PrintDebug("CPUID_FEATURE_IDS_ecx=%p\n", (void *)ecx);
+    PrintDebug("CPUID_EXT_FEATURE_IDS_ecx=%p\n", (void *)ecx);
 
-    if ((ecx & CPUID_FEATURE_IDS_ecx_svm_avail) == 0) {
+    if ((ecx & CPUID_EXT_FEATURE_IDS_ecx_svm_avail) == 0) {
       PrintDebug("SVM Not Available\n");
       return 0;
     }  else {
@@ -419,7 +427,7 @@ static int has_svm_nested_paging() {
 
     v3_cpuid(CPUID_SVM_REV_AND_FEATURE_IDS, &eax, &ebx, &ecx, &edx);
 
-    //PrintDebug("CPUID_FEATURE_IDS_edx=0x%x\n", edx);
+    //PrintDebug("CPUID_EXT_FEATURE_IDS_edx=0x%x\n", edx);
 
     if ((edx & CPUID_SVM_REV_AND_FEATURE_IDS_edx_np) == 0) {
 	PrintDebug("SVM Nested Paging not supported\n");