Re: [Qemu-devel] [PATCH 1/2] De-assert ISA PIC IRQs properly

[Aurelien Jarno]

On Wed, Aug 20, 2008 at 05:16:05PM +0200, Jan Kiszka wrote:
> [ Taking latest isapc changes into account. ]

Applied, thanks.

> In case the PIC IRQ gets de-asserted on an isapc machine, we also have
> to reset CPU_INTERRUPT_HARD. This is what older qemu (before the
> routing-through-APIC changes) used to do as well.
> 
> Signed-off-by: Jan Kiszka <address@hidden>
> ---
>  hw/pc.c |   10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)
> 
> Index: b/hw/pc.c
> ===================================================================
> --- a/hw/pc.c
> +++ b/hw/pc.c
> @@ -118,17 +118,19 @@ static void pic_irq_request(void *opaque
>  {
>      CPUState *env = first_cpu;
>  
> -    if (!level)
> -        return;
> -
>      if (env->apic_state) {
> +        if (!level)
> +            return;
>          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);
> +        if (level)
> +            cpu_interrupt(env, CPU_INTERRUPT_HARD);
> +        else
> +            cpu_reset_interrupt(env, CPU_INTERRUPT_HARD);
>      }
>  }
>  
> 
> 
> 

-- 
  .''`.  Aurelien Jarno             | GPG: 1024D/F1BCDB73
 : :' :  Debian developer           | Electrical Engineer
 `. `'   address@hidden         | address@hidden
   `-    people.debian.org/~aurel32 | www.aurel32.net