Re: [Qemu-devel] [PATCH qom-cpu/arm-devs] hw/cpu/a15mpcore: Use qemu_get_cpu() for generic timers

[Andreas Färber]

Am 21.08.2013 18:45, schrieb Andreas Färber:
> This simplifies the loop and aids with refactoring of CPU list.
> 
> Requested-by: Peter Maydell <address@hidden>
> Signed-off-by: Andreas Färber <address@hidden>
> ---
>  hw/cpu/a15mpcore.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)

Seeing no objection or pick-up from PMM I've applied this to qom-cpu
now, to move forward with CPU list refactoring.

https://github.com/afaerber/qemu-cpu/commits/qom-cpu

Andreas

> 
> diff --git a/hw/cpu/a15mpcore.c b/hw/cpu/a15mpcore.c
> index af182da..9abba67 100644
> --- a/hw/cpu/a15mpcore.c
> +++ b/hw/cpu/a15mpcore.c
> @@ -50,7 +50,6 @@ static int a15mp_priv_init(SysBusDevice *dev)
>      SysBusDevice *busdev;
>      const char *gictype = "arm_gic";
>      int i;
> -    CPUState *cpu;
>  
>      if (kvm_irqchip_in_kernel()) {
>          gictype = "kvm-arm-gic";
> @@ -72,8 +71,8 @@ static int a15mp_priv_init(SysBusDevice *dev)
>      /* Wire the outputs from each CPU's generic timer to the
>       * appropriate GIC PPI inputs
>       */
> -    for (i = 0, cpu = first_cpu; i < s->num_cpu; i++, cpu = cpu->next_cpu) {
> -        DeviceState *cpudev = DEVICE(cpu);
> +    for (i = 0; i < s->num_cpu; i++) {
> +        DeviceState *cpudev = DEVICE(qemu_get_cpu(i));
>          int ppibase = s->num_irq - 32 + i * 32;
>          /* physical timer; we wire it up to the non-secure timer's ID,
>           * since a real A15 always has TrustZone but QEMU doesn't.
> 


-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg