From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52049) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vm4R3-0004CF-CJ for qemu-devel@nongnu.org; Thu, 28 Nov 2013 11:27:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vm4Qs-0002xW-9E for qemu-devel@nongnu.org; Thu, 28 Nov 2013 11:27:25 -0500 Received: from mx1.redhat.com ([209.132.183.28]:23487) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vm4Qs-0002x9-0C for qemu-devel@nongnu.org; Thu, 28 Nov 2013 11:27:14 -0500 From: armbru@redhat.com Date: Thu, 28 Nov 2013 17:27:01 +0100 Message-Id: <1385656023-11519-9-git-send-email-armbru@redhat.com> In-Reply-To: <1385656023-11519-1-git-send-email-armbru@redhat.com> References: <1385656023-11519-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH v4 08/10] vt82c686: Clean up use of 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, marcel.a@redhat.com, afaerber@suse.de, aliguori@amazon.com, peter.maydell@linaro.org From: Markus Armbruster 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 Reviewed-by: Peter Maydell --- hw/ide/via.c | 1 - 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 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 b06d15e..e639357 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 = { -- 1.8.1.4