fixed configuration macro checks and a few configuration bugs

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

diff --git a/palacios/src/palacios/svm.c b/palacios/src/palacios/svm.c
index 5fadae1..4a1b404 100644 (file)
--- a/palacios/src/palacios/svm.c
+++ b/palacios/src/palacios/svm.c
@@ -293,7 +293,6 @@ static int start_svm_guest(struct guest_info *info) {
        */
 
        // disable global interrupts for vm state transition
-
        v3_clgi();
 
 
@@ -311,21 +310,24 @@ static int start_svm_guest(struct guest_info *info) {
        // reenable global interrupts after vm exit
        v3_stgi();
 
+
+       // Conditionally yield the CPU if the timeslice has expired
+       v3_yield_cond(info);
+
+
        v3_update_time(info, tmp_tsc - info->time_state.cached_host_tsc);
        num_exits++;
        
        if ((num_exits % 5000) == 0) {
            PrintDebug("SVM Exit number %d\n", num_exits);
 
+#ifdef CONFIG_PROFILE_VMM
            if (info->enable_profiler) {
                v3_print_profile(info);
            }
+#endif
        }
 
-     
-       // 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;