From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49346) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VUHSW-00084O-Kv for qemu-devel@nongnu.org; Thu, 10 Oct 2013 10:43:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VUHSH-0007Ui-Q9 for qemu-devel@nongnu.org; Thu, 10 Oct 2013 10:43:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:23241) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VUHSH-0007U4-J8 for qemu-devel@nongnu.org; Thu, 10 Oct 2013 10:43:09 -0400 From: armbru@redhat.com Date: Thu, 10 Oct 2013 16:42:51 +0200 Message-Id: <1381416174-5110-7-git-send-email-armbru@redhat.com> In-Reply-To: <1381416174-5110-1-git-send-email-armbru@redhat.com> References: <1381416174-5110-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH RFC 6/9] piix3 piix4: Document why cannot_instantiate_with_device_add_yet List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: borntraeger@de.ibm.com, afaerber@suse.de, anthony@codemonkey.ws, peter.maydell@linaro.org From: Markus Armbruster A PIIX3/PIIX4 southbridge has multiple functions. We model each function as a separate qdev. Two of them need some special wiring set up in pc_init1() or mips_malta_init() to work: the ISA bridge at 01.0, and the SMBus controller at 01.3. Additionally, the IDE controller at 01.1 has always had cannot_instantiate_with_device_add_yet set, but it's not obvious to me why, so keep /* FIXME explain why */ for them. Signed-off-by: Markus Armbruster --- hw/acpi/piix4.c | 7 ++++++- hw/isa/piix4.c | 6 +++++- hw/pci-host/piix.c | 12 ++++++++++-- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index c29a703..c0ad010 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -508,9 +508,14 @@ static void piix4_pm_class_init(ObjectClass *klass, void *data) k->revision = 0x03; k->class_id = PCI_CLASS_BRIDGE_OTHER; dc->desc = "PM"; - dc->cannot_instantiate_with_device_add_yet = true; /* FIXME explain why */ + dc->cannot_instantiate_with_device_add_yet = true; dc->vmsd = &vmstate_acpi; dc->props = piix4_pm_properties; + /* + * Reason: part of PIIX4 southbridge, needs to be wired up, + * e.g. by mips_malta_init() + */ + dc->cannot_instantiate_with_device_add_yet = true; } static const TypeInfo piix4_pm_info = { diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c index d9dac61..def6fe3 100644 --- a/hw/isa/piix4.c +++ b/hw/isa/piix4.c @@ -113,8 +113,12 @@ static void piix4_class_init(ObjectClass *klass, void *data) k->device_id = PCI_DEVICE_ID_INTEL_82371AB_0; k->class_id = PCI_CLASS_BRIDGE_ISA; dc->desc = "ISA bridge"; - dc->cannot_instantiate_with_device_add_yet = true; /* FIXME explain why */ dc->vmsd = &vmstate_piix4; + /* + * Reason: part of PIIX4 southbridge, needs to be wired up, + * e.g. by mips_malta_init() + */ + dc->cannot_instantiate_with_device_add_yet = true; } static const TypeInfo piix4_info = { diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c index 8089fd6..1526fd4 100644 --- a/hw/pci-host/piix.c +++ b/hw/pci-host/piix.c @@ -644,7 +644,6 @@ static void piix3_class_init(ObjectClass *klass, void *data) dc->desc = "ISA bridge"; dc->vmsd = &vmstate_piix3; - dc->cannot_instantiate_with_device_add_yet = true; /* FIXME explain why */ k->no_hotplug = 1; k->init = piix3_initfn; k->config_write = piix3_write_config; @@ -652,6 +651,11 @@ static void piix3_class_init(ObjectClass *klass, void *data) /* 82371SB PIIX3 PCI-to-ISA bridge (Step A1) */ k->device_id = PCI_DEVICE_ID_INTEL_82371SB_0; k->class_id = PCI_CLASS_BRIDGE_ISA; + /* + * Reason: part of PIIX3 southbridge, needs to be wired up by + * pc_piix.c's pc_init1() + */ + dc->cannot_instantiate_with_device_add_yet = true; } static const TypeInfo piix3_info = { @@ -668,7 +672,6 @@ static void piix3_xen_class_init(ObjectClass *klass, void *data) dc->desc = "ISA bridge"; dc->vmsd = &vmstate_piix3; - dc->cannot_instantiate_with_device_add_yet = true; /* FIXME explain why */ k->no_hotplug = 1; k->init = piix3_initfn; k->config_write = piix3_write_config_xen; @@ -676,6 +679,11 @@ static void piix3_xen_class_init(ObjectClass *klass, void *data) /* 82371SB PIIX3 PCI-to-ISA bridge (Step A1) */ k->device_id = PCI_DEVICE_ID_INTEL_82371SB_0; k->class_id = PCI_CLASS_BRIDGE_ISA; + /* + * Reason: part of PIIX3 southbridge, needs to be wired up by + * pc_piix.c's pc_init1() + */ + dc->cannot_instantiate_with_device_add_yet = true; }; static const TypeInfo piix3_xen_info = { -- 1.8.1.4