icc_bus: QOM'ify ICC
For consistency, QOM'ify APIC's parent bus. Signed-off-by: xiaoqiang zhao <zxq_yx_007@163.com> Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
parent
ff6986ce61
commit
494c271784
@ -43,15 +43,13 @@ static const TypeInfo icc_bus_info = {
|
||||
|
||||
static void icc_device_realize(DeviceState *dev, Error **errp)
|
||||
{
|
||||
ICCDevice *id = ICC_DEVICE(dev);
|
||||
ICCDeviceClass *idc = ICC_DEVICE_GET_CLASS(id);
|
||||
ICCDeviceClass *idc = ICC_DEVICE_GET_CLASS(dev);
|
||||
|
||||
if (idc->init) {
|
||||
if (idc->init(id) < 0) {
|
||||
error_setg(errp, "%s initialization failed.",
|
||||
object_get_typename(OBJECT(dev)));
|
||||
}
|
||||
/* convert to QOM */
|
||||
if (idc->realize) {
|
||||
idc->realize(dev, errp);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
static void icc_device_class_init(ObjectClass *oc, void *data)
|
||||
|
@ -284,7 +284,7 @@ static int apic_load_old(QEMUFile *f, void *opaque, int version_id)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int apic_init_common(ICCDevice *dev)
|
||||
static void apic_common_realize(DeviceState *dev, Error **errp)
|
||||
{
|
||||
APICCommonState *s = APIC_COMMON(dev);
|
||||
APICCommonClass *info;
|
||||
@ -293,14 +293,16 @@ static int apic_init_common(ICCDevice *dev)
|
||||
static bool mmio_registered;
|
||||
|
||||
if (apic_no >= MAX_APICS) {
|
||||
return -1;
|
||||
error_setg(errp, "%s initialization failed.",
|
||||
object_get_typename(OBJECT(dev)));
|
||||
return;
|
||||
}
|
||||
s->idx = apic_no++;
|
||||
|
||||
info = APIC_COMMON_GET_CLASS(s);
|
||||
info->realize(DEVICE(dev), NULL);
|
||||
info->realize(dev, errp);
|
||||
if (!mmio_registered) {
|
||||
ICCBus *b = ICC_BUS(qdev_get_parent_bus(DEVICE(dev)));
|
||||
ICCBus *b = ICC_BUS(qdev_get_parent_bus(dev));
|
||||
memory_region_add_subregion(b->apic_address_space, 0, &s->io_memory);
|
||||
mmio_registered = true;
|
||||
}
|
||||
@ -315,7 +317,6 @@ static int apic_init_common(ICCDevice *dev)
|
||||
info->enable_tpr_reporting(s, true);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void apic_dispatch_pre_save(void *opaque)
|
||||
@ -387,7 +388,7 @@ static void apic_common_class_init(ObjectClass *klass, void *data)
|
||||
dc->vmsd = &vmstate_apic_common;
|
||||
dc->reset = apic_reset_common;
|
||||
dc->props = apic_properties_common;
|
||||
idc->init = apic_init_common;
|
||||
idc->realize = apic_common_realize;
|
||||
/*
|
||||
* Reason: APIC and CPU need to be wired up by
|
||||
* x86_cpu_apic_create()
|
||||
|
@ -66,7 +66,7 @@ typedef struct ICCDeviceClass {
|
||||
DeviceClass parent_class;
|
||||
/*< public >*/
|
||||
|
||||
int (*init)(ICCDevice *dev); /* TODO replace with QOM realize */
|
||||
DeviceRealize realize;
|
||||
} ICCDeviceClass;
|
||||
|
||||
#define TYPE_ICC_DEVICE "icc-device"
|
||||
|
Loading…
Reference in New Issue
Block a user