diff options
| author | Lara Lazier <laramglazier@gmail.com> | 2021-07-21 17:26:49 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2021-07-22 14:44:47 +0200 |
| commit | b128b25a5a2b1a7db6965a6d3fd0e4f6f0affc50 (patch) | |
| tree | cf135ba9e7e95e671f2d19862774626af164c682 /target/i386/tcg/sysemu/svm_helper.c | |
| parent | 40e07370f21f12f020c1eb8a8d8c5321774e488a (diff) | |
| download | qemu-b128b25a5a2b1a7db6965a6d3fd0e4f6f0affc50.zip qemu-b128b25a5a2b1a7db6965a6d3fd0e4f6f0affc50.tar.gz qemu-b128b25a5a2b1a7db6965a6d3fd0e4f6f0affc50.tar.bz2 | |
target/i386: Added V_INTR_PRIO check to virtual interrupts
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 <laramglazier@gmail.com>
Message-Id: <20210721152651.14683-1-laramglazier@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'target/i386/tcg/sysemu/svm_helper.c')
| -rw-r--r-- | target/i386/tcg/sysemu/svm_helper.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/target/i386/tcg/sysemu/svm_helper.c b/target/i386/tcg/sysemu/svm_helper.c index 00618cf..72b03a3 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_MASKING_SHIFT; + tpr = int_ctl & V_TPR_MASK; + return (int_ctl & V_IRQ_MASK) && (int_prio >= tpr); +} + void helper_vmrun(CPUX86State *env, int aflag, int next_eip_addend) { CPUState *cs = env_cpu(env); @@ -290,7 +300,7 @@ void helper_vmrun(CPUX86State *env, int aflag, int next_eip_addend) env->hflags2 |= HF2_GIF_MASK; - if (int_ctl & V_IRQ_MASK) { + if (ctl_has_irq(int_ctl)) { CPUState *cs = env_cpu(env); cs->interrupt_request |= CPU_INTERRUPT_VIRQ; |