hw/riscv/sifive_clic: Fix array index calculation in sifive_clic_realize

Michael Clark · Michael Clark · commit d7480e99e8be · 2018-08-01T12:04:18.000+12:00
diff --git a/hw/riscv/sifive_clic.c b/hw/riscv/sifive_clic.c
@@ -719,7 +719,7 @@ static void sifive_clic_realize(DeviceState *dev, Error **errp)
     for (hartid = 0; hartid < clic->num_harts; hartid++) {
         for (irq = 0; irq < clic->num_sources; irq++) {
             int id = sifive_clic_encode_irq_id(hartid, irq);
-            size_t irq_offset = harts_x_sources + irq;
+            size_t irq_offset = hartid * clic->num_sources + irq;
             clic->irqs[irq_offset] = qemu_allocate_irq(sifive_clic_irq,
                                                        clic, id);
         }

Original file line number	Diff line number	Diff line change
`@@ -719,7 +719,7 @@ static void sifive_clic_realize(DeviceState dev, Error *errp)`
`719`	`719`	`for (hartid = 0; hartid < clic->num_harts; hartid++) {`
`720`	`720`	`for (irq = 0; irq < clic->num_sources; irq++) {`
`721`	`721`	`int id = sifive_clic_encode_irq_id(hartid, irq);`
`722`		`- size_t irq_offset = harts_x_sources + irq;`
	`722`	`+ size_t irq_offset = hartid * clic->num_sources + irq;`
`723`	`723`	`clic->irqs[irq_offset] = qemu_allocate_irq(sifive_clic_irq,`
`724`	`724`	`clic, id);`
`725`	`725`	`}`