| Message ID | 20170922160111.31885-2-f4bug@amsat.org |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | remove i386/pc dependency from non-PC world (part 1) | expand |
Le 22/09/2017 à 18:01, Philippe Mathieu-Daudé a écrit : > and remove the old i386/pc dependency > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > include/hw/timer/mc146818rtc.h | 3 ++- > hw/alpha/dp264.c | 2 +- > hw/i386/pc.c | 2 +- > hw/isa/i82378.c | 3 ++- > hw/mips/mips_fulong2e.c | 2 +- > hw/mips/mips_jazz.c | 2 +- > hw/mips/mips_malta.c | 2 +- > hw/mips/mips_r4k.c | 2 +- > hw/ppc/pnv.c | 2 +- > hw/timer/mc146818rtc.c | 2 +- > 10 files changed, 12 insertions(+), 10 deletions(-) Reviewed-by: Hervé Poussineau <hpoussin@reactos.org>
On Fri, Sep 22, 2017 at 01:01:01PM -0300, Philippe Mathieu-Daudé wrote: > and remove the old i386/pc dependency > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: David Gibson <david@gibson.dropbear.id.au> > --- > include/hw/timer/mc146818rtc.h | 3 ++- > hw/alpha/dp264.c | 2 +- > hw/i386/pc.c | 2 +- > hw/isa/i82378.c | 3 ++- > hw/mips/mips_fulong2e.c | 2 +- > hw/mips/mips_jazz.c | 2 +- > hw/mips/mips_malta.c | 2 +- > hw/mips/mips_r4k.c | 2 +- > hw/ppc/pnv.c | 2 +- > hw/timer/mc146818rtc.c | 2 +- > 10 files changed, 12 insertions(+), 10 deletions(-) > > diff --git a/include/hw/timer/mc146818rtc.h b/include/hw/timer/mc146818rtc.h > index 7c8e64b203..fe6ed63f71 100644 > --- a/include/hw/timer/mc146818rtc.h > +++ b/include/hw/timer/mc146818rtc.h > @@ -6,7 +6,8 @@ > > #define TYPE_MC146818_RTC "mc146818rtc" > > -ISADevice *rtc_init(ISABus *bus, int base_year, qemu_irq intercept_irq); > +ISADevice *mc146818_rtc_init(ISABus *bus, int base_year, > + qemu_irq intercept_irq); > void rtc_set_memory(ISADevice *dev, int addr, int val); > int rtc_get_memory(ISADevice *dev, int addr); > > diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c > index 2253990654..df6dadf13f 100644 > --- a/hw/alpha/dp264.c > +++ b/hw/alpha/dp264.c > @@ -80,7 +80,7 @@ static void clipper_init(MachineState *machine) > clipper_pci_map_irq); > > /* Since we have an SRM-compatible PALcode, use the SRM epoch. */ > - rtc_init(isa_bus, 1900, rtc_irq); > + mc146818_rtc_init(isa_bus, 1900, rtc_irq); > > i8254_pit_init(isa_bus, 0x40, 0, NULL); > isa_create_simple(isa_bus, TYPE_I8042); > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index 76d4be5991..788844e0de 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -1545,7 +1545,7 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi, > rtc_irq = qdev_get_gpio_in(hpet, HPET_LEGACY_RTC_INT); > } > } > - *rtc_state = rtc_init(isa_bus, 2000, rtc_irq); > + *rtc_state = mc146818_rtc_init(isa_bus, 2000, rtc_irq); > > qemu_register_boot_set(pc_boot_set, *rtc_state); > > diff --git a/hw/isa/i82378.c b/hw/isa/i82378.c > index 7a8baef23c..14b006cadc 100644 > --- a/hw/isa/i82378.c > +++ b/hw/isa/i82378.c > @@ -21,6 +21,7 @@ > #include "hw/pci/pci.h" > #include "hw/i386/pc.h" > #include "hw/timer/i8254.h" > +#include "hw/timer/mc146818rtc.h" > #include "hw/audio/pcspk.h" > > #define TYPE_I82378 "i82378" > @@ -106,7 +107,7 @@ static void i82378_realize(PCIDevice *pci, Error **errp) > isa = isa_create_simple(isabus, "i82374"); > > /* timer */ > - isa_create_simple(isabus, "mc146818rtc"); > + isa_create_simple(isabus, TYPE_MC146818_RTC); > } > > static void i82378_init(Object *obj) > diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c > index 6dc6a0ac18..7ebbffa8f2 100644 > --- a/hw/mips/mips_fulong2e.c > +++ b/hw/mips/mips_fulong2e.c > @@ -371,7 +371,7 @@ static void mips_fulong2e_init(MachineState *machine) > /* Super I/O */ > isa_create_simple(isa_bus, TYPE_I8042); > > - rtc_init(isa_bus, 2000, NULL); > + mc146818_rtc_init(isa_bus, 2000, NULL); > > serial_hds_isa_init(isa_bus, 0, MAX_SERIAL_PORTS); > parallel_hds_isa_init(isa_bus, 1); > diff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c > index 1b54602c1d..439bbd71fe 100644 > --- a/hw/mips/mips_jazz.c > +++ b/hw/mips/mips_jazz.c > @@ -295,7 +295,7 @@ static void mips_jazz_init(MachineState *machine, > fdctrl_init_sysbus(qdev_get_gpio_in(rc4030, 1), -1, 0x80003000, fds); > > /* Real time clock */ > - rtc_init(isa_bus, 1980, NULL); > + mc146818_rtc_init(isa_bus, 1980, NULL); > memory_region_init_io(rtc, NULL, &rtc_ops, NULL, "rtc", 0x1000); > memory_region_add_subregion(address_space, 0x80004000, rtc); > > diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c > index 050da36f1d..6945fa47c3 100644 > --- a/hw/mips/mips_malta.c > +++ b/hw/mips/mips_malta.c > @@ -1225,7 +1225,7 @@ void mips_malta_init(MachineState *machine) > /* Super I/O */ > isa_create_simple(isa_bus, TYPE_I8042); > > - rtc_init(isa_bus, 2000, NULL); > + mc146818_rtc_init(isa_bus, 2000, NULL); > serial_hds_isa_init(isa_bus, 0, 2); > parallel_hds_isa_init(isa_bus, 1); > > diff --git a/hw/mips/mips_r4k.c b/hw/mips/mips_r4k.c > index 946097a31f..349da59912 100644 > --- a/hw/mips/mips_r4k.c > +++ b/hw/mips/mips_r4k.c > @@ -279,7 +279,7 @@ void mips_r4k_init(MachineState *machine) > i8259 = i8259_init(isa_bus, env->irq[2]); > isa_bus_irqs(isa_bus, i8259); > > - rtc_init(isa_bus, 2000, NULL); > + mc146818_rtc_init(isa_bus, 2000, NULL); > > pit = i8254_pit_init(isa_bus, 0x40, 0, NULL); > > diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c > index 47221158d4..d188b899c5 100644 > --- a/hw/ppc/pnv.c > +++ b/hw/ppc/pnv.c > @@ -647,7 +647,7 @@ static void ppc_powernv_init(MachineState *machine) > serial_hds_isa_init(pnv->isa_bus, 0, MAX_SERIAL_PORTS); > > /* Create an RTC ISA device too */ > - rtc_init(pnv->isa_bus, 2000, NULL); > + mc146818_rtc_init(pnv->isa_bus, 2000, NULL); > > /* OpenPOWER systems use a IPMI SEL Event message to notify the > * host to powerdown */ > diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c > index 82843ed03f..f7d8c4bae4 100644 > --- a/hw/timer/mc146818rtc.c > +++ b/hw/timer/mc146818rtc.c > @@ -997,7 +997,7 @@ static void rtc_realizefn(DeviceState *dev, Error **errp) > qdev_init_gpio_out(dev, &s->irq, 1); > } > > -ISADevice *rtc_init(ISABus *bus, int base_year, qemu_irq intercept_irq) > +ISADevice *mc146818_rtc_init(ISABus *bus, int base_year, qemu_irq intercept_irq) > { > DeviceState *dev; > ISADevice *isadev;
diff --git a/include/hw/timer/mc146818rtc.h b/include/hw/timer/mc146818rtc.h index 7c8e64b203..fe6ed63f71 100644 --- a/include/hw/timer/mc146818rtc.h +++ b/include/hw/timer/mc146818rtc.h @@ -6,7 +6,8 @@ #define TYPE_MC146818_RTC "mc146818rtc" -ISADevice *rtc_init(ISABus *bus, int base_year, qemu_irq intercept_irq); +ISADevice *mc146818_rtc_init(ISABus *bus, int base_year, + qemu_irq intercept_irq); void rtc_set_memory(ISADevice *dev, int addr, int val); int rtc_get_memory(ISADevice *dev, int addr); diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c index 2253990654..df6dadf13f 100644 --- a/hw/alpha/dp264.c +++ b/hw/alpha/dp264.c @@ -80,7 +80,7 @@ static void clipper_init(MachineState *machine) clipper_pci_map_irq); /* Since we have an SRM-compatible PALcode, use the SRM epoch. */ - rtc_init(isa_bus, 1900, rtc_irq); + mc146818_rtc_init(isa_bus, 1900, rtc_irq); i8254_pit_init(isa_bus, 0x40, 0, NULL); isa_create_simple(isa_bus, TYPE_I8042); diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 76d4be5991..788844e0de 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1545,7 +1545,7 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi, rtc_irq = qdev_get_gpio_in(hpet, HPET_LEGACY_RTC_INT); } } - *rtc_state = rtc_init(isa_bus, 2000, rtc_irq); + *rtc_state = mc146818_rtc_init(isa_bus, 2000, rtc_irq); qemu_register_boot_set(pc_boot_set, *rtc_state); diff --git a/hw/isa/i82378.c b/hw/isa/i82378.c index 7a8baef23c..14b006cadc 100644 --- a/hw/isa/i82378.c +++ b/hw/isa/i82378.c @@ -21,6 +21,7 @@ #include "hw/pci/pci.h" #include "hw/i386/pc.h" #include "hw/timer/i8254.h" +#include "hw/timer/mc146818rtc.h" #include "hw/audio/pcspk.h" #define TYPE_I82378 "i82378" @@ -106,7 +107,7 @@ static void i82378_realize(PCIDevice *pci, Error **errp) isa = isa_create_simple(isabus, "i82374"); /* timer */ - isa_create_simple(isabus, "mc146818rtc"); + isa_create_simple(isabus, TYPE_MC146818_RTC); } static void i82378_init(Object *obj) diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c index 6dc6a0ac18..7ebbffa8f2 100644 --- a/hw/mips/mips_fulong2e.c +++ b/hw/mips/mips_fulong2e.c @@ -371,7 +371,7 @@ static void mips_fulong2e_init(MachineState *machine) /* Super I/O */ isa_create_simple(isa_bus, TYPE_I8042); - rtc_init(isa_bus, 2000, NULL); + mc146818_rtc_init(isa_bus, 2000, NULL); serial_hds_isa_init(isa_bus, 0, MAX_SERIAL_PORTS); parallel_hds_isa_init(isa_bus, 1); diff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c index 1b54602c1d..439bbd71fe 100644 --- a/hw/mips/mips_jazz.c +++ b/hw/mips/mips_jazz.c @@ -295,7 +295,7 @@ static void mips_jazz_init(MachineState *machine, fdctrl_init_sysbus(qdev_get_gpio_in(rc4030, 1), -1, 0x80003000, fds); /* Real time clock */ - rtc_init(isa_bus, 1980, NULL); + mc146818_rtc_init(isa_bus, 1980, NULL); memory_region_init_io(rtc, NULL, &rtc_ops, NULL, "rtc", 0x1000); memory_region_add_subregion(address_space, 0x80004000, rtc); diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index 050da36f1d..6945fa47c3 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -1225,7 +1225,7 @@ void mips_malta_init(MachineState *machine) /* Super I/O */ isa_create_simple(isa_bus, TYPE_I8042); - rtc_init(isa_bus, 2000, NULL); + mc146818_rtc_init(isa_bus, 2000, NULL); serial_hds_isa_init(isa_bus, 0, 2); parallel_hds_isa_init(isa_bus, 1); diff --git a/hw/mips/mips_r4k.c b/hw/mips/mips_r4k.c index 946097a31f..349da59912 100644 --- a/hw/mips/mips_r4k.c +++ b/hw/mips/mips_r4k.c @@ -279,7 +279,7 @@ void mips_r4k_init(MachineState *machine) i8259 = i8259_init(isa_bus, env->irq[2]); isa_bus_irqs(isa_bus, i8259); - rtc_init(isa_bus, 2000, NULL); + mc146818_rtc_init(isa_bus, 2000, NULL); pit = i8254_pit_init(isa_bus, 0x40, 0, NULL); diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c index 47221158d4..d188b899c5 100644 --- a/hw/ppc/pnv.c +++ b/hw/ppc/pnv.c @@ -647,7 +647,7 @@ static void ppc_powernv_init(MachineState *machine) serial_hds_isa_init(pnv->isa_bus, 0, MAX_SERIAL_PORTS); /* Create an RTC ISA device too */ - rtc_init(pnv->isa_bus, 2000, NULL); + mc146818_rtc_init(pnv->isa_bus, 2000, NULL); /* OpenPOWER systems use a IPMI SEL Event message to notify the * host to powerdown */ diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c index 82843ed03f..f7d8c4bae4 100644 --- a/hw/timer/mc146818rtc.c +++ b/hw/timer/mc146818rtc.c @@ -997,7 +997,7 @@ static void rtc_realizefn(DeviceState *dev, Error **errp) qdev_init_gpio_out(dev, &s->irq, 1); } -ISADevice *rtc_init(ISABus *bus, int base_year, qemu_irq intercept_irq) +ISADevice *mc146818_rtc_init(ISABus *bus, int base_year, qemu_irq intercept_irq) { DeviceState *dev; ISADevice *isadev;
and remove the old i386/pc dependency Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- include/hw/timer/mc146818rtc.h | 3 ++- hw/alpha/dp264.c | 2 +- hw/i386/pc.c | 2 +- hw/isa/i82378.c | 3 ++- hw/mips/mips_fulong2e.c | 2 +- hw/mips/mips_jazz.c | 2 +- hw/mips/mips_malta.c | 2 +- hw/mips/mips_r4k.c | 2 +- hw/ppc/pnv.c | 2 +- hw/timer/mc146818rtc.c | 2 +- 10 files changed, 12 insertions(+), 10 deletions(-)