diff options
| author | Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> | 2022-06-24 14:40:55 +0100 |
|---|---|---|
| committer | Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> | 2022-06-26 18:40:12 +0100 |
| commit | 5cbf35d20f71f87ade944b3835db389c260f2c59 (patch) | |
| tree | cf31ffa49e83007b1a7c5e370de174c3e60c40ae /hw/hppa | |
| parent | 07c68b501056fd45e52db0067fdb3ea0ea571961 (diff) | |
| download | qemu-5cbf35d20f71f87ade944b3835db389c260f2c59.zip qemu-5cbf35d20f71f87ade944b3835db389c260f2c59.tar.gz qemu-5cbf35d20f71f87ade944b3835db389c260f2c59.tar.bz2 | |
lasips2: rename lasips2_init() to lasips2_initfn() and update it to return the LASIPS2 device
When QOMifying a device it is typical to use _init() as the suffix for an
instance_init function, however this name is already in use by the legacy LASIPS2
wrapper function. Eventually the wrapper function will be removed, but for now
rename it to lasips2_initfn() to avoid a naming collision.
At the same time update lasips2_initfn() return the LASIPS2 device so that it
can later be accessed using qdev APIs by the HPPA machine.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Acked-by: Helge Deller <deller@gmx.de>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20220624134109.881989-41-mark.cave-ayland@ilande.co.uk>
Diffstat (limited to 'hw/hppa')
| -rw-r--r-- | hw/hppa/machine.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c index 63b9dd2..72677ae 100644 --- a/hw/hppa/machine.c +++ b/hw/hppa/machine.c @@ -280,8 +280,8 @@ static void machine_hppa_init(MachineState *machine) } /* PS/2 Keyboard/Mouse */ - lasips2_init(addr_space, LASI_PS2KBD_HPA, - qdev_get_gpio_in(lasi_dev, LASI_IRQ_PS2KBD_HPA)); + lasips2_initfn(addr_space, LASI_PS2KBD_HPA, + qdev_get_gpio_in(lasi_dev, LASI_IRQ_PS2KBD_HPA)); /* register power switch emulation */ qemu_register_powerdown_notifier(&hppa_system_powerdown_notifier); |