Commit 0d936928 authored by Anthony Liguori's avatar Anthony Liguori Committed by Andreas Färber
Browse files

qdev: Convert busses to QEMU Object Model 



This is far less interesting than it sounds.  We simply add an Object to each
BusState and then register the types appropriately.  Most of the interesting
refactoring will follow in the next patches.

Since we're changing fundamental type names (BusInfo -> BusClass), it all needs
to convert at once.  Fortunately, not a lot of code is affected.

Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
[AF: Made all new bus TypeInfos static const.]
[AF: Made qbus_free() call object_delete(), required {qom,glib}_allocated]
Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
parent 8185d216

hw/i2c.c

+10 −5
Original line number Diff line number Diff line
@@ -22,9 +22,13 @@ static Property i2c_props[] = { 
    DEFINE_PROP_END_OF_LIST(),

};



static struct BusInfo i2c_bus_info = {

    .name = "I2C",

    .size = sizeof(i2c_bus),

#define TYPE_I2C_BUS "i2c-bus"

#define I2C_BUS(obj) OBJECT_CHECK(i2c_bus, (obj), TYPE_I2C_BUS)



static const TypeInfo i2c_bus_info = {

    .name = TYPE_I2C_BUS,

    .parent = TYPE_BUS,

    .instance_size = sizeof(i2c_bus),

};



static void i2c_bus_pre_save(void *opaque)
@@ -62,7 +66,7 @@ i2c_bus *i2c_init_bus(DeviceState *parent, const char *name) 
{

    i2c_bus *bus;



    bus = FROM_QBUS(i2c_bus, qbus_create(&i2c_bus_info, parent, name));

    bus = FROM_QBUS(i2c_bus, qbus_create(TYPE_I2C_BUS, parent, name));

    vmstate_register(NULL, -1, &vmstate_i2c_bus, bus);

    return bus;

}
@@ -219,7 +223,7 @@ static void i2c_slave_class_init(ObjectClass *klass, void *data) 
{

    DeviceClass *k = DEVICE_CLASS(klass);

    k->init = i2c_slave_qdev_init;

    k->bus_info = &i2c_bus_info;

    k->bus_type = TYPE_I2C_BUS;

    k->props = i2c_props;

}
@@ -234,6 +238,7 @@ static TypeInfo i2c_slave_type_info = { 


static void i2c_slave_register_types(void)

{

    type_register_static(&i2c_bus_info);

    type_register_static(&i2c_slave_type_info);

}

hw/ide/internal.h

+3 −0
Original line number Diff line number Diff line
@@ -25,6 +25,9 @@ typedef struct IDEState IDEState; 
typedef struct IDEDMA IDEDMA;

typedef struct IDEDMAOps IDEDMAOps;



#define TYPE_IDE_BUS "IDE"

#define IDE_BUS(obj) OBJECT_CHECK(IDEBus, (obj), TYPE_IDE_BUS)



/* Bits of HD_STATUS */

#define ERR_STAT		0x01

#define INDEX_STAT		0x02

hw/ide/qdev.c

+15 −6
Original line number Diff line number Diff line
@@ -32,15 +32,23 @@ static Property ide_props[] = { 
    DEFINE_PROP_END_OF_LIST(),

};



static struct BusInfo ide_bus_info = {

    .name  = "IDE",

    .size  = sizeof(IDEBus),

    .get_fw_dev_path = idebus_get_fw_dev_path,

static void ide_bus_class_init(ObjectClass *klass, void *data)

{

    BusClass *k = BUS_CLASS(klass);



    k->get_fw_dev_path = idebus_get_fw_dev_path;

}



static const TypeInfo ide_bus_info = {

    .name = TYPE_IDE_BUS,

    .parent = TYPE_BUS,

    .instance_size = sizeof(IDEBus),

    .class_init = ide_bus_class_init,

};



void ide_bus_new(IDEBus *idebus, DeviceState *dev, int bus_id)

{

    qbus_create_inplace(&idebus->qbus, &ide_bus_info, dev, NULL);

    qbus_create_inplace(&idebus->qbus, TYPE_IDE_BUS, dev, NULL);

    idebus->bus_id = bus_id;

}
@@ -249,7 +257,7 @@ static void ide_device_class_init(ObjectClass *klass, void *data) 
{

    DeviceClass *k = DEVICE_CLASS(klass);

    k->init = ide_qdev_init;

    k->bus_info = &ide_bus_info;

    k->bus_type = TYPE_IDE_BUS;

    k->props = ide_props;

}
@@ -264,6 +272,7 @@ static TypeInfo ide_device_type_info = { 


static void ide_register_types(void)

{

    type_register_static(&ide_bus_info);

    type_register_static(&ide_hd_info);

    type_register_static(&ide_cd_info);

    type_register_static(&ide_drive_info);

hw/intel-hda.c

+7 −5
Original line number Diff line number Diff line
@@ -34,16 +34,17 @@ static Property hda_props[] = { 
    DEFINE_PROP_END_OF_LIST()

};



static struct BusInfo hda_codec_bus_info = {

    .name      = "HDA",

    .size      = sizeof(HDACodecBus),

static const TypeInfo hda_codec_bus_info = {

    .name = TYPE_HDA_BUS,

    .parent = TYPE_BUS,

    .instance_size = sizeof(HDACodecBus),

};



void hda_codec_bus_init(DeviceState *dev, HDACodecBus *bus,

                        hda_codec_response_func response,

                        hda_codec_xfer_func xfer)

{

    qbus_create_inplace(&bus->qbus, &hda_codec_bus_info, dev, NULL);

    qbus_create_inplace(&bus->qbus, TYPE_HDA_BUS, dev, NULL);

    bus->response = response;

    bus->xfer = xfer;

}
@@ -1276,7 +1277,7 @@ static void hda_codec_device_class_init(ObjectClass *klass, void *data) 
    DeviceClass *k = DEVICE_CLASS(klass);

    k->init = hda_codec_dev_init;

    k->exit = hda_codec_dev_exit;

    k->bus_info = &hda_codec_bus_info;

    k->bus_type = TYPE_HDA_BUS;

    k->props = hda_props;

}
@@ -1291,6 +1292,7 @@ static TypeInfo hda_codec_device_type_info = { 


static void intel_hda_register_types(void)

{

    type_register_static(&hda_codec_bus_info);

    type_register_static(&intel_hda_info);

    type_register_static(&hda_codec_device_type_info);

}

hw/intel-hda.h

+3 −0
Original line number Diff line number Diff line
@@ -14,6 +14,9 @@ 
#define HDA_CODEC_DEVICE_GET_CLASS(obj) \

     OBJECT_GET_CLASS(HDACodecDeviceClass, (obj), TYPE_HDA_CODEC_DEVICE)



#define TYPE_HDA_BUS "HDA"

#define HDA_BUS(obj) OBJECT_CHECK(HDACodecBus, (obj), TYPE_HDA_BUS)



typedef struct HDACodecBus HDACodecBus;

typedef struct HDACodecDevice HDACodecDevice;