Re: [PATCH v2] target/i386: Added V_INTR_PRIO check to virtual interrupts

[Paolo Bonzini]

On 28/07/21 12:17, Lara Lazier wrote:

v1->v2: Fixed Mask

The APM2 states that The processor takes a virtual INTR interrupt
if V_IRQ and V_INTR_PRIO indicate that there is a virtual interrupt pending
whose priority is greater than the value in V_TPR.

Signed-off-by: Lara Lazier <laramglaz...@gmail.com>
---
  target/i386/tcg/sysemu/svm_helper.c | 11 ++++++++++-
  1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/target/i386/tcg/sysemu/svm_helper.c 
b/target/i386/tcg/sysemu/svm_helper.c
index 72ea7c9a08..a3138e9f86 100644
--- a/target/i386/tcg/sysemu/svm_helper.c
+++ b/target/i386/tcg/sysemu/svm_helper.c
@@ -65,6 +65,16 @@ static inline void svm_load_seg_cache(CPUX86State *env, 
hwaddr addr,
                             sc->base, sc->limit, sc->flags);
  }

+static inline bool ctl_has_irq(uint32_t int_ctl)

+{
+    uint32_t int_prio;
+    uint32_t tpr;
+
+    int_prio = (int_ctl & V_INTR_PRIO_MASK) >> V_INTR_PRIO_SHIFT;
+    tpr = int_ctl & V_TPR_MASK;
+    return (int_ctl & V_IRQ_MASK) && (int_prio >= tpr);
+}
+
  static inline bool is_efer_invalid_state (CPUX86State *env)
  {
      if (!(env->efer & MSR_EFER_SVME)) {
@@ -365,7 +375,6 @@ void helper_vmrun(CPUX86State *env, int aflag, int 
next_eip_addend)

if (ctl_has_irq(int_ctl)) {

          CPUState *cs = env_cpu(env);
-
          cs->interrupt_request |= CPU_INTERRUPT_VIRQ;
      }

Merged, thanks.

Paolo