Commit 010d2dc4 authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Paolo Bonzini
Browse files

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



Signed-off-by: default avatarPhilippe 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: default avatarMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent a48c6b51

hw/isa/pc87312.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

hw/ppc/prep.c

+1 −1
Original line number Diff line number Diff line
@@ -612,7 +612,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);

include/hw/isa/pc87312.h

+2 −2
Original line number Diff line number Diff line
@@ -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;