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

xics: convert init() to realize()

Browse Source 
This fixes XICS according new QOM rules.

This converts ICS's init() callbacks to realize().

This converts legacy qdev_init_nofail() to property_set(realized).

Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Reviewed-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
Alexey Kardashevskiy 2013-09-26 16:18:40 +10:00 committed by Alexander Graf
parent d1b5682d88
commit b45ff2d942
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
hw/intc/xics.c
View File

@ -479,15 +479,17 @@ static const VMStateDescription vmstate_ics = {
}, },
}; };
static int ics_realize(DeviceState *dev) static void ics_realize(DeviceState *dev, Error **errp)
{ {
ICSState *ics = ICS(dev); ICSState *ics = ICS(dev);
if (!ics->nr_irqs) {
error_setg(errp, "Number of interrupts needs to be greater 0");
return;
}
ics->irqs = g_malloc0(ics->nr_irqs * sizeof(ICSIRQState)); ics->irqs = g_malloc0(ics->nr_irqs * sizeof(ICSIRQState));
ics->islsi = g_malloc0(ics->nr_irqs * sizeof(bool)); ics->islsi = g_malloc0(ics->nr_irqs * sizeof(bool));
ics->qirqs = qemu_allocate_irqs(ics_set_irq, ics, ics->nr_irqs); ics->qirqs = qemu_allocate_irqs(ics_set_irq, ics, ics->nr_irqs);
return 0;
} }
static void ics_class_init(ObjectClass *klass, void *data) static void ics_class_init(ObjectClass *klass, void *data)
@ -495,7 +497,7 @@ static void ics_class_init(ObjectClass *klass, void *data)
DeviceClass *dc = DEVICE_CLASS(klass); DeviceClass *dc = DEVICE_CLASS(klass);
ICSStateClass *isc = ICS_CLASS(klass); ICSStateClass *isc = ICS_CLASS(klass);
dc->init = ics_realize; dc->realize = ics_realize;
dc->vmsd = &vmstate_ics; dc->vmsd = &vmstate_ics;
dc->reset = ics_reset; dc->reset = ics_reset;
isc->post_load = ics_post_load; isc->post_load = ics_post_load;
@ -691,8 +693,14 @@ static void xics_realize(DeviceState *dev, Error **errp)
{ {
XICSState *icp = XICS(dev); XICSState *icp = XICS(dev);
ICSState *ics = icp->ics; ICSState *ics = icp->ics;
Error *error = NULL;
int i; int i;
if (!icp->nr_servers) {
error_setg(errp, "Number of servers needs to be greater 0");
return;
}
/* Registration of global state belongs into realize */ /* Registration of global state belongs into realize */
spapr_rtas_register("ibm,set-xive", rtas_set_xive); spapr_rtas_register("ibm,set-xive", rtas_set_xive);
spapr_rtas_register("ibm,get-xive", rtas_get_xive); spapr_rtas_register("ibm,get-xive", rtas_get_xive);
@ -707,7 +715,11 @@ static void xics_realize(DeviceState *dev, Error **errp)
ics->nr_irqs = icp->nr_irqs; ics->nr_irqs = icp->nr_irqs;
ics->offset = XICS_IRQ_BASE; ics->offset = XICS_IRQ_BASE;
ics->icp = icp; ics->icp = icp;
qdev_init_nofail(DEVICE(ics)); object_property_set_bool(OBJECT(icp->ics), true, "realized", &error);
if (error) {
error_propagate(errp, error);
return;
}
icp->ss = g_malloc0(icp->nr_servers*sizeof(ICPState)); icp->ss = g_malloc0(icp->nr_servers*sizeof(ICPState));
for (i = 0; i < icp->nr_servers; i++) { for (i = 0; i < icp->nr_servers; i++) {
@ -715,7 +727,11 @@ static void xics_realize(DeviceState *dev, Error **errp)
object_initialize(&icp->ss[i], sizeof(icp->ss[i]), TYPE_ICP); object_initialize(&icp->ss[i], sizeof(icp->ss[i]), TYPE_ICP);
snprintf(buffer, sizeof(buffer), "icp[%d]", i); snprintf(buffer, sizeof(buffer), "icp[%d]", i);
object_property_add_child(OBJECT(icp), buffer, OBJECT(&icp->ss[i]), NULL); object_property_add_child(OBJECT(icp), buffer, OBJECT(&icp->ss[i]), NULL);
qdev_init_nofail(DEVICE(&icp->ss[i])); object_property_set_bool(OBJECT(&icp->ss[i]), true, "realized", &error);
if (error) {
error_propagate(errp, error);
return;
}
} }
} }