From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1KVofs-0006Rk-IH
	for qemu-devel@nongnu.org; Wed, 20 Aug 2008 10:28:36 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1KVofr-0006Pg-Cq
	for qemu-devel@nongnu.org; Wed, 20 Aug 2008 10:28:35 -0400
Received: from [199.232.76.173] (port=50095 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1KVofr-0006PR-5p
	for qemu-devel@nongnu.org; Wed, 20 Aug 2008 10:28:35 -0400
Received: from gecko.sbs.de ([194.138.37.40]:18314)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60)
	(envelope-from <jan.kiszka@siemens.com>) id 1KVofq-0006qw-R5
	for qemu-devel@nongnu.org; Wed, 20 Aug 2008 10:28:35 -0400
Received: from mail2.sbs.de (localhost [127.0.0.1])
	by gecko.sbs.de (8.12.11.20060308/8.12.11) with ESMTP id m7KESSbQ003408
	for <qemu-devel@nongnu.org>; Wed, 20 Aug 2008 16:28:28 +0200
Received: from [139.25.109.167] (mchn012c.mchp.siemens.de [139.25.109.167]
	(may be forged))
	by mail2.sbs.de (8.12.11.20060308/8.12.11) with ESMTP id m7KESSqD029409
	for <qemu-devel@nongnu.org>; Wed, 20 Aug 2008 16:28:28 +0200
Message-ID: <48AC2A0D.4020602@siemens.com>
Date: Wed, 20 Aug 2008 16:28:29 +0200
From: Jan Kiszka <jan.kiszka@siemens.com>
MIME-Version: 1.0
References: <E1KVQk6-0002JW-LI@cvs.savannah.gnu.org>
In-Reply-To: <E1KVQk6-0002JW-LI@cvs.savannah.gnu.org>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Subject: [Qemu-devel] Re: [5026] i386: fix isapc machine
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

Aurelien Jarno wrote:
> Revision: 5026
>           http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5026
> Author:   aurel32
> Date:     2008-08-19 12:55:20 +0000 (Tue, 19 Aug 2008)
> 
> Log Message:
> -----------
> i386: fix isapc machine
> 
> - cirrus vga: enable graphic console
> - pc: don't use apic for interrupts on ISA machine
> 

...

> Modified: trunk/hw/pc.c
> ===================================================================
> --- trunk/hw/pc.c	2008-08-18 18:00:31 UTC (rev 5025)
> +++ trunk/hw/pc.c	2008-08-19 12:55:20 UTC (rev 5026)
> @@ -121,10 +121,14 @@
>      if (!level)
>          return;
>  
> -    while (env) {
> -        if (apic_accept_pic_intr(env))
> -            apic_local_deliver(env, APIC_LINT0);
> -        env = env->next_cpu;
> +    if (env->apic_state) {
> +        while (env) {
> +            if (apic_accept_pic_intr(env))
> +                apic_local_deliver(env, APIC_LINT0);
> +            env = env->next_cpu;
> +        }
> +    } else {
> +        cpu_interrupt(env, CPU_INTERRUPT_HARD);
>      }
>  }

Considering our recent experience with the APIC path, and also when
looking at old qemu versions, just asserting CPU_INTERRUPT_HARD won't be
enough. We also need cpu_reset_interrupt in the (!level) case. Will post
a patch, along with a rebased version for the APIC fix.

Jan

-- 
Siemens AG, Corporate Technology, CT SE 2
Corporate Competence Center Embedded Linux