From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45358) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eZcrq-0001QP-9b for qemu-devel@nongnu.org; Thu, 11 Jan 2018 08:26:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eZcrn-0006g1-4d for qemu-devel@nongnu.org; Thu, 11 Jan 2018 08:26:02 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52016) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eZcrm-0006fM-TU for qemu-devel@nongnu.org; Thu, 11 Jan 2018 08:25:59 -0500 References: <20180111082452.27295.85707.stgit@pasha-VirtualBox> <20180111082514.27295.13900.stgit@pasha-VirtualBox> From: Paolo Bonzini Message-ID: <1a1c19d4-d48d-1d12-fc77-ab9657ef4271@redhat.com> Date: Thu, 11 Jan 2018 13:29:34 +0100 MIME-Version: 1.0 In-Reply-To: <20180111082514.27295.13900.stgit@pasha-VirtualBox> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [RFC PATCH v3 03/30] This patch adds a condition before overwriting exception_index fields. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Pavel Dovgalyuk , qemu-devel@nongnu.org Cc: kwolf@redhat.com, peter.maydell@linaro.org, boost.lists@gmail.com, quintela@redhat.com, jasowang@redhat.com, mst@redhat.com, zuban32s@gmail.com, maria.klimushenkova@ispras.ru, dovgaluk@ispras.ru, kraxel@redhat.com, alex.bennee@linaro.org On 11/01/2018 09:25, Pavel Dovgalyuk wrote: > It is needed when exception_index is already set to some meaningful value. > > Signed-off-by: Pavel Dovgalyuk > Signed-off-by: Paolo Bonzini > --- > accel/tcg/cpu-exec.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c > index 280200f..9cc6972 100644 > --- a/accel/tcg/cpu-exec.c > +++ b/accel/tcg/cpu-exec.c > @@ -585,6 +585,7 @@ static inline bool cpu_handle_interrupt(CPUState *cpu, > else { > if (cc->cpu_exec_interrupt(cpu, interrupt_request)) { > replay_interrupt(); > + cpu->exception_index = -1; > *last_tb = NULL; > } > /* The target hook may have updated the 'cpu->interrupt_request'; > @@ -606,7 +607,9 @@ static inline bool cpu_handle_interrupt(CPUState *cpu, > if (unlikely(atomic_read(&cpu->exit_request) > || (use_icount && cpu->icount_decr.u16.low + cpu->icount_extra == 0))) { > atomic_set(&cpu->exit_request, 0); > - cpu->exception_index = EXCP_INTERRUPT; > + if (cpu->exception_index == -1) { > + cpu->exception_index = EXCP_INTERRUPT; > + } > return true; > } > > Where does my S-o-b come from? :) Paolo