diff mbox

[08/10] vt82c686: Clean up use of cannot_instantiate_with_device_add_yet

Message ID 1382018101-6102-9-git-send-email-armbru@redhat.com
State New
Headers show

Commit Message

Markus Armbruster Oct. 17, 2013, 1:54 p.m. UTC 
From: Markus Armbruster <armbru@redhat.com>

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>
---
 hw/ide/via.c      | 1 -
 hw/isa/vt82c686.c | 6 +++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

Comments

Peter Maydell Oct. 23, 2013, 9:59 a.m. UTC | #1 
On 17 October 2013 14:54,  <armbru@redhat.com> wrote:
> From: Markus Armbruster <armbru@redhat.com>
>
> 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>

-- PMM
diff mbox

Patch

diff --git a/hw/ide/via.c b/hw/ide/via.c
index b556c14..198123b 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 3e8ec80..ec7c259 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 = {