From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1K3buZ-0002nr-V2
	for qemu-devel@nongnu.org; Tue, 03 Jun 2008 15:11:11 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1K3buY-0002n1-DG
	for qemu-devel@nongnu.org; Tue, 03 Jun 2008 15:11:11 -0400
Received: from [199.232.76.173] (port=38145 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1K3buY-0002my-7Y
	for qemu-devel@nongnu.org; Tue, 03 Jun 2008 15:11:10 -0400
Received: from wr-out-0506.google.com ([64.233.184.228]:39705)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <anthony@codemonkey.ws>) id 1K3buY-0000u0-AG
	for qemu-devel@nongnu.org; Tue, 03 Jun 2008 15:11:10 -0400
Received: by wr-out-0506.google.com with SMTP id c49so567288wra.19
	for <qemu-devel@nongnu.org>; Tue, 03 Jun 2008 12:11:09 -0700 (PDT)
Message-ID: <48459740.20606@codemonkey.ws>
Date: Tue, 03 Jun 2008 14:10:56 -0500
From: Anthony Liguori <anthony@codemonkey.ws>
MIME-Version: 1.0
Subject: Re: [Qemu-devel] [PATCH] Reset interrupt_request on loadvm
References: <484444CC.8040202@web.de>
In-Reply-To: <484444CC.8040202@web.de>
Content-Type: text/plain; charset=ISO-8859-15; format=flowed
Content-Transfer-Encoding: 7bit
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

Jan Kiszka wrote:
> Trying to use savevm/loadvm to reduce my debug round-trip times, I came
> across this bug. The following reset is required to avoid spurious IRQ
> injections after the system state has been loaded from a snapshot. Not
> sure if it is a regression of SVN head, but Qemu from my Suse 10.3 seems
> to be immune.
>
> Signed-off-by: Jan Kiszka <jan.kiszka@web.de>
> ---
>  cpu-defs.h |    3 +++
>  vl.c       |    3 +++
>  2 files changed, 6 insertions(+)
>
> Index: b/cpu-defs.h
> ===================================================================
> --- a/cpu-defs.h
> +++ b/cpu-defs.h
> @@ -172,3 +172,6 @@ typedef struct CPUTLBEntry {
>      const char *cpu_model_str;
>  
>  #endif
> +
> +#define foreach_cpu(env) \
> +    for(env = first_cpu; env != NULL; env = env->next_cpu)
>   

Please don't introduce this sort of wrapper in this patch.  If you think 
open coded iterations should be eliminated, do it in a separate patch.

Regards,

Anthony Liguori

> Index: b/vl.c
> ===================================================================
> --- a/vl.c
> +++ b/vl.c
> @@ -6032,6 +6032,7 @@ static SaveStateEntry *find_se(const cha
>  static int qemu_loadvm_state(QEMUFile *f)
>  {
>      SaveStateEntry *se;
> +    CPUState *env;
>      int len, ret, instance_id, record_len, version_id;
>      int64_t total_len, end_pos, cur_pos;
>      unsigned int v;
> @@ -6046,6 +6047,8 @@ static int qemu_loadvm_state(QEMUFile *f
>          ret = -1;
>          goto the_end;
>      }
> +    foreach_cpu(env)
> +        env->interrupt_request = 0;
>      total_len = qemu_get_be64(f);
>      end_pos = total_len + qemu_ftell(f);
>      for(;;) {
>
>
>