mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/isa/pc87312: Rename the device type as TYPE_PC87312_SUPERIO

Browse Source 
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Acked-by: David Gibson <david@gibson.dropbear.id.au> (hw/ppc)
Message-Id: <20180308223946.26784-6-f4bug@amsat.org>
Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2018-03-08 23:39:26 +01:00 committed by Paolo Bonzini
parent a48c6b5155
commit 010d2dc473
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/isa/pc87312.c
View File

@ -391,7 +391,7 @@ static void pc87312_class_init(ObjectClass *klass, void *data)
} }
static const TypeInfo pc87312_type_info = { static const TypeInfo pc87312_type_info = {
.name = TYPE_PC87312, .name = TYPE_PC87312_SUPERIO,
.parent = TYPE_ISA_DEVICE, .parent = TYPE_ISA_DEVICE,
.instance_size = sizeof(PC87312State), .instance_size = sizeof(PC87312State),
.instance_init = pc87312_initfn, .instance_init = pc87312_initfn,

2
hw/ppc/prep.c
View File

@ -612,7 +612,7 @@ static void ppc_prep_init(MachineState *machine)
isa_bus = ISA_BUS(qdev_get_child_bus(DEVICE(pci), "isa.0")); isa_bus = ISA_BUS(qdev_get_child_bus(DEVICE(pci), "isa.0"));
/* Super I/O (parallel + serial ports) */ /* Super I/O (parallel + serial ports) */
isa = isa_create(isa_bus, TYPE_PC87312); isa = isa_create(isa_bus, TYPE_PC87312_SUPERIO);
dev = DEVICE(isa); dev = DEVICE(isa);
qdev_prop_set_uint8(dev, "config", 13); /* fdc, ser0, ser1, par0 */ qdev_prop_set_uint8(dev, "config", 13); /* fdc, ser0, ser1, par0 */
qdev_init_nofail(dev); qdev_init_nofail(dev);

4
include/hw/isa/pc87312.h
View File

@ -28,8 +28,8 @@
#include "hw/isa/isa.h" #include "hw/isa/isa.h"
#define TYPE_PC87312 "pc87312" #define TYPE_PC87312_SUPERIO "pc87312"
#define PC87312(obj) OBJECT_CHECK(PC87312State, (obj), TYPE_PC87312) #define PC87312(obj) OBJECT_CHECK(PC87312State, (obj), TYPE_PC87312_SUPERIO)
typedef struct PC87312State { typedef struct PC87312State {
ISADevice dev; ISADevice dev;