| Message ID | 20180308223946.26784-6-f4bug@amsat.org |
|---|---|
| State | New |
| Headers | show |
| Series | remove i386/pc dependency: generic SuperIO | expand |
On 08/03/18 22:39, Philippe Mathieu-Daudé wrote: > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > Acked-by: David Gibson <david@gibson.dropbear.id.au> (hw/ppc) > --- > include/hw/isa/pc87312.h | 4 ++-- > hw/isa/pc87312.c | 2 +- > hw/ppc/prep.c | 2 +- > 3 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/include/hw/isa/pc87312.h b/include/hw/isa/pc87312.h > index bf74470d40..710eb1c807 100644 > --- a/include/hw/isa/pc87312.h > +++ b/include/hw/isa/pc87312.h > @@ -28,8 +28,8 @@ > #include "hw/isa/isa.h" > > > -#define TYPE_PC87312 "pc87312" > -#define PC87312(obj) OBJECT_CHECK(PC87312State, (obj), TYPE_PC87312) > +#define TYPE_PC87312_SUPERIO "pc87312" > +#define PC87312(obj) OBJECT_CHECK(PC87312State, (obj), TYPE_PC87312_SUPERIO) > > typedef struct PC87312State { > ISADevice dev; > diff --git a/hw/isa/pc87312.c b/hw/isa/pc87312.c > index 48b29e3c3c..e9edbc6c50 100644 > --- a/hw/isa/pc87312.c > +++ b/hw/isa/pc87312.c > @@ -391,7 +391,7 @@ static void pc87312_class_init(ObjectClass *klass, void *data) > } > > static const TypeInfo pc87312_type_info = { > - .name = TYPE_PC87312, > + .name = TYPE_PC87312_SUPERIO, > .parent = TYPE_ISA_DEVICE, > .instance_size = sizeof(PC87312State), > .instance_init = pc87312_initfn, > diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c > index ae724b0613..610ec7ec32 100644 > --- a/hw/ppc/prep.c > +++ b/hw/ppc/prep.c > @@ -613,7 +613,7 @@ static void ppc_prep_init(MachineState *machine) > isa_bus = ISA_BUS(qdev_get_child_bus(DEVICE(pci), "isa.0")); > > /* Super I/O (parallel + serial ports) */ > - isa = isa_create(isa_bus, TYPE_PC87312); > + isa = isa_create(isa_bus, TYPE_PC87312_SUPERIO); > dev = DEVICE(isa); > qdev_prop_set_uint8(dev, "config", 13); /* fdc, ser0, ser1, par0 */ > qdev_init_nofail(dev); > Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> ATB, Mark.
diff --git a/include/hw/isa/pc87312.h b/include/hw/isa/pc87312.h index bf74470d40..710eb1c807 100644 --- a/include/hw/isa/pc87312.h +++ b/include/hw/isa/pc87312.h @@ -28,8 +28,8 @@ #include "hw/isa/isa.h" -#define TYPE_PC87312 "pc87312" -#define PC87312(obj) OBJECT_CHECK(PC87312State, (obj), TYPE_PC87312) +#define TYPE_PC87312_SUPERIO "pc87312" +#define PC87312(obj) OBJECT_CHECK(PC87312State, (obj), TYPE_PC87312_SUPERIO) typedef struct PC87312State { ISADevice dev; diff --git a/hw/isa/pc87312.c b/hw/isa/pc87312.c index 48b29e3c3c..e9edbc6c50 100644 --- a/hw/isa/pc87312.c +++ b/hw/isa/pc87312.c @@ -391,7 +391,7 @@ static void pc87312_class_init(ObjectClass *klass, void *data) } static const TypeInfo pc87312_type_info = { - .name = TYPE_PC87312, + .name = TYPE_PC87312_SUPERIO, .parent = TYPE_ISA_DEVICE, .instance_size = sizeof(PC87312State), .instance_init = pc87312_initfn, diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c index ae724b0613..610ec7ec32 100644 --- a/hw/ppc/prep.c +++ b/hw/ppc/prep.c @@ -613,7 +613,7 @@ static void ppc_prep_init(MachineState *machine) isa_bus = ISA_BUS(qdev_get_child_bus(DEVICE(pci), "isa.0")); /* Super I/O (parallel + serial ports) */ - isa = isa_create(isa_bus, TYPE_PC87312); + isa = isa_create(isa_bus, TYPE_PC87312_SUPERIO); dev = DEVICE(isa); qdev_prop_set_uint8(dev, "config", 13); /* fdc, ser0, ser1, par0 */ qdev_init_nofail(dev);