| Message ID | 20201016182739.22875-1-mark.cave-ayland@ilande.co.uk |
|---|---|
| Headers | show |
| Series | m48t59: remove legacy init functions | expand |
Le 16/10/2020 à 20:27, Mark Cave-Ayland a écrit : > This patchset is inspired by Philippe's "hw/rtc/m48t59: Simplify m48t59_init()" > patchset at https://lists.gnu.org/archive/html/qemu-devel/2020-10/msg04493.html > but goes further: rather than tidy-up the legacy init functions, convert the > callers to use qdev properties directly so they can simply be removed. > > Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> > > > Mark Cave-Ayland (5): > m48t59-isa: remove legacy m48t59_init_isa() function > sun4m: use qdev properties instead of legacy m48t59_init() function > sun4u: use qdev properties instead of legacy m48t59_init() function > ppc405_boards: use qdev properties instead of legacy m48t59_init() > function > m48t59: remove legacy m48t59_init() function > > hw/ppc/ppc405_boards.c | 10 +++++++++- > hw/rtc/m48t59-isa.c | 25 ------------------------- > hw/rtc/m48t59.c | 35 ----------------------------------- > hw/sparc/sun4m.c | 8 +++++++- > hw/sparc64/sun4u.c | 7 +++++-- > include/hw/rtc/m48t59.h | 6 ------ > 6 files changed, 21 insertions(+), 70 deletions(-) > Reviewed-by: Hervé Poussineau <hpoussin@reactos.org>
On 10/16/20 8:27 PM, Mark Cave-Ayland wrote: > Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> > --- > hw/sparc/sun4m.c | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c > index 54a2b2f9ef..a9bb60f2b2 100644 > --- a/hw/sparc/sun4m.c > +++ b/hw/sparc/sun4m.c > @@ -966,7 +966,13 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef, > create_unimplemented_device("SUNW,sx", hwdef->sx_base, 0x2000); > } > > - nvram = m48t59_init(slavio_irq[0], hwdef->nvram_base, 0, 0x2000, 1968, 8); > + dev = qdev_new("sysbus-m48t08"); > + qdev_prop_set_int32(dev, "base-year", 1968); > + s = SYS_BUS_DEVICE(dev); > + sysbus_realize_and_unref(s, &error_fatal); > + sysbus_connect_irq(s, 0, slavio_irq[0]); > + sysbus_mmio_map(s, 0, hwdef->nvram_base); > + nvram = NVRAM(dev); While here, can you declare "Nvram *nvram"? Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > > slavio_timer_init_all(hwdef->counter_base, slavio_irq[19], slavio_cpu_irq, smp_cpus); > >
On 17/10/2020 10:42, Philippe Mathieu-Daudé wrote: > On 10/16/20 8:27 PM, Mark Cave-Ayland wrote: >> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> >> --- >> hw/sparc/sun4m.c | 8 +++++++- >> 1 file changed, 7 insertions(+), 1 deletion(-) >> >> diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c >> index 54a2b2f9ef..a9bb60f2b2 100644 >> --- a/hw/sparc/sun4m.c >> +++ b/hw/sparc/sun4m.c >> @@ -966,7 +966,13 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef, >> create_unimplemented_device("SUNW,sx", hwdef->sx_base, 0x2000); >> } >> - nvram = m48t59_init(slavio_irq[0], hwdef->nvram_base, 0, 0x2000, 1968, 8); >> + dev = qdev_new("sysbus-m48t08"); >> + qdev_prop_set_int32(dev, "base-year", 1968); >> + s = SYS_BUS_DEVICE(dev); >> + sysbus_realize_and_unref(s, &error_fatal); >> + sysbus_connect_irq(s, 0, slavio_irq[0]); >> + sysbus_mmio_map(s, 0, hwdef->nvram_base); >> + nvram = NVRAM(dev); > > While here, can you declare "Nvram *nvram"? > > Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > >> slavio_timer_init_all(hwdef->counter_base, slavio_irq[19], slavio_cpu_irq, >> smp_cpus); Yes, that's a good idea. I can fix that up before I apply to my qemu-macppc branc if there are no other issues. ATB, Mark.
This patchset is inspired by Philippe's "hw/rtc/m48t59: Simplify m48t59_init()" patchset at https://lists.gnu.org/archive/html/qemu-devel/2020-10/msg04493.html but goes further: rather than tidy-up the legacy init functions, convert the callers to use qdev properties directly so they can simply be removed. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> Mark Cave-Ayland (5): m48t59-isa: remove legacy m48t59_init_isa() function sun4m: use qdev properties instead of legacy m48t59_init() function sun4u: use qdev properties instead of legacy m48t59_init() function ppc405_boards: use qdev properties instead of legacy m48t59_init() function m48t59: remove legacy m48t59_init() function hw/ppc/ppc405_boards.c | 10 +++++++++- hw/rtc/m48t59-isa.c | 25 ------------------------- hw/rtc/m48t59.c | 35 ----------------------------------- hw/sparc/sun4m.c | 8 +++++++- hw/sparc64/sun4u.c | 7 +++++-- include/hw/rtc/m48t59.h | 6 ------ 6 files changed, 21 insertions(+), 70 deletions(-)