Commit 6220e900 authored by Pavel Dovgalyuk's avatar Pavel Dovgalyuk Committed by Paolo Bonzini
Browse files

i386: partial revert of interrupt poll fix 



Processing CPU_INTERRUPT_POLL requests in cpu_has_work functions
break the determinism of cpu_exec. This patch is required to make
interrupts processing deterministic.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>

Signed-off-by: default avatarPavel Dovgalyuk <pavel.dovgaluk@ispras.ru>
Message-Id: <20150917162331.8676.15286.stgit@PASHA-ISP.def.inno>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 4ecd4d16

cpu-exec.c

+9 −0
Original line number Diff line number Diff line
@@ -27,6 +27,9 @@ 
#include "exec/address-spaces.h"

#include "qemu/rcu.h"

#include "exec/tb-hash.h"

#if defined(TARGET_I386) && !defined(CONFIG_USER_ONLY)

#include "hw/i386/apic.h"

#endif



/* -icount align implementation. */
@@ -343,6 +346,12 @@ int cpu_exec(CPUState *cpu) 
    SyncClocks sc;



    if (cpu->halted) {

#if defined(TARGET_I386) && !defined(CONFIG_USER_ONLY)

        if (cpu->interrupt_request & CPU_INTERRUPT_POLL) {

            apic_poll_irq(x86_cpu->apic_state);

            cpu_reset_interrupt(cpu, CPU_INTERRUPT_POLL);

        }

#endif

        if (!cpu_has_work(cpu)) {

            return EXCP_HALTED;

        }

target-i386/cpu.c

+2 −8
Original line number Diff line number Diff line
@@ -3098,14 +3098,8 @@ static bool x86_cpu_has_work(CPUState *cs) 
    X86CPU *cpu = X86_CPU(cs);

    CPUX86State *env = &cpu->env;



#if !defined(CONFIG_USER_ONLY)

    if (cs->interrupt_request & CPU_INTERRUPT_POLL) {

        apic_poll_irq(cpu->apic_state);

        cpu_reset_interrupt(cs, CPU_INTERRUPT_POLL);

    }

#endif



    return ((cs->interrupt_request & CPU_INTERRUPT_HARD) &&

    return ((cs->interrupt_request & (CPU_INTERRUPT_HARD |

                                      CPU_INTERRUPT_POLL)) &&

            (env->eflags & IF_MASK)) ||

           (cs->interrupt_request & (CPU_INTERRUPT_NMI |

                                     CPU_INTERRUPT_INIT |