diff options
| author | Markus Armbruster <armbru@redhat.com> | 2013-11-28 17:27:01 +0100 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2013-12-23 00:27:23 +0100 |
| commit | 04916ee9fb8ff4be4d9f612b85aef009ec57b0b4 (patch) | |
| tree | 19bb7ecdb6c0104c2c073c1d699aaad7f163274c | |
| parent | 81aab2ff1118a4de8fd92ae89380ccfbc2870574 (diff) | |
vt82c686: Clean up use of cannot_instantiate_with_device_add_yet
A VT82C686B southbridge has multiple functions. We model each
function as a separate qdev. One of them need some special wiring set
up in mips_fulong2e_init() to work: the ISA bridge at 05.0.
The IDE controller at 05.1 (via-ide) has always had
cannot_instantiate_with_device_add_yet set, but there is no obvious
reason why device_add could not work for them. Drop it.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Andreas Färber <afaerber@suse.de>
| -rw-r--r-- | hw/ide/via.c | 1 | ||||
| -rw-r--r-- | hw/isa/vt82c686.c | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/hw/ide/via.c b/hw/ide/via.c index b556c14ac7..198123b026 100644 --- a/hw/ide/via.c +++ b/hw/ide/via.c @@ -225,7 +225,6 @@ static void via_ide_class_init(ObjectClass *klass, void *data) k->revision = 0x06; k->class_id = PCI_CLASS_STORAGE_IDE; set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); - dc->cannot_instantiate_with_device_add_yet = true; /* FIXME explain why */ } static const TypeInfo via_ide_info = { diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c index b06d15e9d0..e639357db3 100644 --- a/hw/isa/vt82c686.c +++ b/hw/isa/vt82c686.c @@ -480,8 +480,12 @@ static void via_class_init(ObjectClass *klass, void *data) k->class_id = PCI_CLASS_BRIDGE_ISA; k->revision = 0x40; dc->desc = "ISA bridge"; - dc->cannot_instantiate_with_device_add_yet = true; /* FIXME explain why */ dc->vmsd = &vmstate_via; + /* + * Reason: part of VIA VT82C686 southbridge, needs to be wired up, + * e.g. by mips_fulong2e_init() + */ + dc->cannot_instantiate_with_device_add_yet = true; } static const TypeInfo via_info = { |