From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34168) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c8zeK-0005xz-QF for qemu-devel@nongnu.org; Mon, 21 Nov 2016 20:13:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c8zeG-00053i-K8 for qemu-devel@nongnu.org; Mon, 21 Nov 2016 20:13:28 -0500 Received: from mx1.redhat.com ([209.132.183.28]:60072) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1c8zeG-00053C-DY for qemu-devel@nongnu.org; Mon, 21 Nov 2016 20:13:24 -0500 From: Eduardo Habkost Date: Mon, 21 Nov 2016 23:12:11 -0200 Message-Id: <1479777133-23567-14-git-send-email-ehabkost@redhat.com> In-Reply-To: <1479777133-23567-1-git-send-email-ehabkost@redhat.com> References: <1479777133-23567-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [RFC 13/15] mips: Initialize default bus lists List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, Markus Armbruster , Marcel Apfelbaum , "Michael S. Tsirkin" Cc: Aurelien Jarno , Yongbok Kim Populate default_bus_types for some machines. Work in progress, I didn't check if all machines were converted (so we could enable strict mode for mips in qmp-machine-info.py). Cc: Aurelien Jarno Cc: Yongbok Kim Signed-off-by: Eduardo Habkost --- hw/mips/mips_malta.c | 7 +++++++ hw/mips/mips_r4k.c | 2 ++ 2 files changed, 9 insertions(+) diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index cf48f42..af25595 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -57,6 +57,7 @@ #include "sysemu/kvm.h" #include "exec/semihost.h" #include "hw/mips/cps.h" +#include "hw/usb.h" //#define DEBUG_BOARD_INIT @@ -1266,6 +1267,12 @@ static void mips_malta_machine_init(MachineClass *mc) mc->init = mips_malta_init; mc->max_cpus = 16; mc->is_default = 1; + machine_class_add_default_bus(mc, "floppy-bus"); //FIXME: use macro + machine_class_add_default_bus(mc, "i2c-bus"); //FIXME: use macro + machine_class_add_default_bus(mc, TYPE_PCI_BUS); + machine_class_add_default_bus(mc, TYPE_ISA_BUS); + machine_class_add_default_bus(mc, "IDE");//FIXME: use macro + machine_class_add_default_bus(mc, TYPE_USB_BUS); } DEFINE_MACHINE("malta", mips_malta_machine_init) diff --git a/hw/mips/mips_r4k.c b/hw/mips/mips_r4k.c index 27548c4..69ca97a 100644 --- a/hw/mips/mips_r4k.c +++ b/hw/mips/mips_r4k.c @@ -306,6 +306,8 @@ static void mips_machine_init(MachineClass *mc) { mc->desc = "mips r4k platform"; mc->init = mips_r4k_init; + machine_class_add_default_bus(mc, TYPE_ISA_BUS); + machine_class_add_default_bus(mc, "IDE");//FIXME: use macro } DEFINE_MACHINE("mips", mips_machine_init) -- 2.7.4