diff options
| author | Pavel Dovgalyuk <pavel.dovgaluk@ispras.ru> | 2017-01-24 10:17:08 +0300 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2017-01-27 18:07:30 +0100 |
| commit | d718b14b8cc2a28dcf48b68c87f16a36d280c36e (patch) | |
| tree | 3fe54f24075b4c151186177e1a861e95ef97bea6 | |
| parent | 8094532b476754d751cd2a46958862fbaccadc24 (diff) | |
replay: improve interrupt handling
This patch improves interrupt handling in record/replay mode.
Now "interrupt" event is saved only when cc->cpu_exec_interrupt returns true.
This patch also adds missing return to cpu_exec_interrupt function.
Signed-off-by: Pavel Dovgalyuk <pavel.dovgaluk@ispras.ru>
Message-Id: <20170124071708.4572.64023.stgit@PASHA-ISP>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | cpu-exec.c | 2 | ||||
| -rw-r--r-- | target/i386/seg_helper.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/cpu-exec.c b/cpu-exec.c index 4188fed3c6..fa08c733da 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -508,8 +508,8 @@ static inline void cpu_handle_interrupt(CPUState *cpu, True when it is, and we should restart on a new TB, and via longjmp via cpu_loop_exit. */ else { - replay_interrupt(); if (cc->cpu_exec_interrupt(cpu, interrupt_request)) { + replay_interrupt(); *last_tb = NULL; } /* The target hook may have updated the 'cpu->interrupt_request'; diff --git a/target/i386/seg_helper.c b/target/i386/seg_helper.c index fb79f3180d..d24574da7f 100644 --- a/target/i386/seg_helper.c +++ b/target/i386/seg_helper.c @@ -1331,6 +1331,7 @@ bool x86_cpu_exec_interrupt(CPUState *cs, int interrupt_request) #endif if (interrupt_request & CPU_INTERRUPT_SIPI) { do_cpu_sipi(cpu); + ret = true; } else if (env->hflags2 & HF2_GIF_MASK) { if ((interrupt_request & CPU_INTERRUPT_SMI) && !(env->hflags & HF_SMM_MASK)) { |