mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-05 00:33:55 -06:00
isa: Use realizefn for ISADevice
Drop ISADeviceClass::init and the resulting no-op initfn and let children implement their own realizefn. Adapt error handling. Split off an instance_init where sensible. Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
parent
a3dcca567a
commit
db895a1e6a
34 changed files with 292 additions and 243 deletions
|
@ -201,7 +201,7 @@ static void qdev_applesmc_isa_reset(DeviceState *dev)
|
|||
applesmc_add_key(s, "MSSD", 1, "\0x3");
|
||||
}
|
||||
|
||||
static int applesmc_isa_init(ISADevice *dev)
|
||||
static void applesmc_isa_realize(DeviceState *dev, Error **errp)
|
||||
{
|
||||
AppleSMCState *s = APPLE_SMC(dev);
|
||||
|
||||
|
@ -220,9 +220,7 @@ static int applesmc_isa_init(ISADevice *dev)
|
|||
}
|
||||
|
||||
QLIST_INIT(&s->data_def);
|
||||
qdev_applesmc_isa_reset(&dev->qdev);
|
||||
|
||||
return 0;
|
||||
qdev_applesmc_isa_reset(dev);
|
||||
}
|
||||
|
||||
static Property applesmc_isa_properties[] = {
|
||||
|
@ -235,8 +233,8 @@ static Property applesmc_isa_properties[] = {
|
|||
static void qdev_applesmc_class_init(ObjectClass *klass, void *data)
|
||||
{
|
||||
DeviceClass *dc = DEVICE_CLASS(klass);
|
||||
ISADeviceClass *ic = ISA_DEVICE_CLASS(klass);
|
||||
ic->init = applesmc_isa_init;
|
||||
|
||||
dc->realize = applesmc_isa_realize;
|
||||
dc->reset = qdev_applesmc_isa_reset;
|
||||
dc->props = applesmc_isa_properties;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue