Re: [Qemu-devel] [PATCH 3/6] xics: disable flags reset on xics reset

[Alexander Graf <agraf@suse.de>]

On 05/07/2014 08:01 AM, Alexey Kardashevskiy wrote:
> Since islsi[] array has been merged into the ICSState struct,
> we must not reset flags as they tell if the interrupt is in use.
>
> Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
> ---
>   hw/intc/xics.c     | 4 +++-
>   hw/intc/xics_kvm.c | 4 +++-
>   2 files changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/hw/intc/xics.c b/hw/intc/xics.c
> index 9314654..7a64b2e 100644
> --- a/hw/intc/xics.c
> +++ b/hw/intc/xics.c
> @@ -522,10 +522,12 @@ static void ics_reset(DeviceState *dev)
>       ICSState *ics = ICS(dev);
>       int i;
>   
> -    memset(ics->irqs, 0, sizeof(ICSIRQState) * ics->nr_irqs);
>       for (i = 0; i < ics->nr_irqs; i++) {
> +        ics->irqs[i].server = 0;
>           ics->irqs[i].priority = 0xff;
>           ics->irqs[i].saved_priority = 0xff;
> +        ics->irqs[i].status = 0;
> +        /* Do not reset @flags as IRQ might be allocated */

I think the code would be more obvious if you save the flags before you 
do the memset() - that would then have to move into the loop - and 
restore them afterwards.


Alex

>       }
>   }
>   
> diff --git a/hw/intc/xics_kvm.c b/hw/intc/xics_kvm.c
> index 456fc2c..a322593 100644
> --- a/hw/intc/xics_kvm.c
> +++ b/hw/intc/xics_kvm.c
> @@ -272,10 +272,12 @@ static void ics_kvm_reset(DeviceState *dev)
>       ICSState *ics = ICS(dev);
>       int i;
>   
> -    memset(ics->irqs, 0, sizeof(ICSIRQState) * ics->nr_irqs);
>       for (i = 0; i < ics->nr_irqs; i++) {
> +        ics->irqs[i].server = 0;
>           ics->irqs[i].priority = 0xff;
>           ics->irqs[i].saved_priority = 0xff;
> +        ics->irqs[i].status = 0;
> +        /* Do not reset @flags as IRQ might be allocated */
>       }
>   
>       ics_set_kvm_state(ics, 1);