diff options
| author | Andreas Färber <afaerber@suse.de> | 2012-11-25 02:37:14 +0100 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2013-06-07 12:14:45 +0200 |
| commit | db895a1e6a97e919f9b86d60c969377357b05066 (patch) | |
| tree | 72f6786abe90f7fa77d2f10416df73cb9d62e35a /include/hw | |
| parent | a3dcca567a1d4a5c79fb9c8fe2d9a21a4a7cebd5 (diff) | |
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>
Diffstat (limited to 'include/hw')
| -rw-r--r-- | include/hw/char/serial.h | 2 | ||||
| -rw-r--r-- | include/hw/isa/isa.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/include/hw/char/serial.h b/include/hw/char/serial.h index bca79f17b5..c15354ae05 100644 --- a/include/hw/char/serial.h +++ b/include/hw/char/serial.h @@ -83,7 +83,7 @@ struct SerialState { extern const VMStateDescription vmstate_serial; extern const MemoryRegionOps serial_io_ops; -void serial_init_core(SerialState *s); +void serial_realize_core(SerialState *s, Error **errp); void serial_exit_core(SerialState *s); void serial_set_frequency(SerialState *s, uint32_t frequency); diff --git a/include/hw/isa/isa.h b/include/hw/isa/isa.h index 82da37c11d..1f6ff55605 100644 --- a/include/hw/isa/isa.h +++ b/include/hw/isa/isa.h @@ -22,7 +22,6 @@ typedef struct ISADeviceClass { DeviceClass parent_class; - int (*init)(ISADevice *dev); } ISADeviceClass; struct ISABus { |