Skip to content

Commit

Permalink
hw/sparc/leon3: Pass DeviceState opaque argument to leon3_start_cpu()
Browse files Browse the repository at this point in the history
By passing a DeviceState context to a QDev IRQ handler,
we can simplify and use qdev_init_gpio_in_named() instead
of qdev_init_gpio_in_named_with_opaque().

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Message-Id: <20240215144623.76233-3-philmd@linaro.org>
  • Loading branch information
philmd committed Feb 15, 2024
1 parent 5c7127e commit 0850739
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions hw/sparc/leon3.c
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,8 @@ static void leon3_start_cpu_async_work(CPUState *cpu, run_on_cpu_data data)

static void leon3_start_cpu(void *opaque, int n, int level)
{
CPUState *cs = CPU(opaque);
DeviceState *cpu = opaque;
CPUState *cs = CPU(cpu);

assert(level == 1);
async_run_on_cpu(cs, leon3_start_cpu_async_work, RUN_ON_CPU_NULL);
Expand Down Expand Up @@ -310,8 +311,7 @@ static void leon3_generic_hw_init(MachineState *machine)
for (i = 0; i < machine->smp.cpus; i++) {
cpu = reset_info->info[i].cpu;
env = &cpu->env;
qdev_init_gpio_in_named_with_opaque(DEVICE(cpu), leon3_start_cpu,
cpu, "start_cpu", 1);
qdev_init_gpio_in_named(DEVICE(cpu), leon3_start_cpu, "start_cpu", 1);
qdev_connect_gpio_out_named(irqmpdev, "grlib-start-cpu", i,
qdev_get_gpio_in_named(DEVICE(cpu),
"start_cpu", 0));
Expand Down

0 comments on commit 0850739

Please sign in to comment.