Optimization: Moved tunnel updates outside guest-execution loop

Signed-off-by: Alexandro Sanchez Bach <asanchez@kryptoslogic.com>

Author: AlexAltea

core/cpu.c

@@ -353,11 +353,6 @@ int cpu_vmx_execute(struct vcpu_t *vcpu, struct hax_tunnel *htun)
          */
         hax_handle_idt_vectoring(vcpu);
 
-        if (vcpu->nr_pending_intrs > 0 || hax_intr_is_blocked(vcpu))
-            htun->ready_for_interrupt_injection = 0;
-        else
-            htun->ready_for_interrupt_injection = 1;
-
         vcpu->cur_state = GS_STALE;
         vmcs_err = put_vmcs(vcpu, &flags);
         if (vmcs_err) {

core/vcpu.c

@@ -1685,6 +1685,15 @@ int vcpu_execute(struct vcpu_t *vcpu)
     }
     err = cpu_vmx_execute(vcpu, htun);
     vcpu_is_panic(vcpu);
+
+    if (vcpu->nr_pending_intrs > 0 || hax_intr_is_blocked(vcpu))
+        htun->ready_for_interrupt_injection = 0;
+    else
+        htun->ready_for_interrupt_injection = 1;
+
+    if (htun->_exit_status == HAX_EXIT_HLT)
+        htun->ready_for_interrupt_injection = 1;
+
 out:
     if (err) {
         vcpu->cur_state = GS_STALE;
@@ -2729,7 +2738,6 @@ static int exit_hlt(struct vcpu_t *vcpu, struct hax_tunnel *htun)
     if (hax_valid_vector(vector))
         return HAX_RESUME;
 
-    htun->ready_for_interrupt_injection = 1;
     return HAX_EXIT;
 }