[Qemu-devel] [RFC 13/15] mips: Initialize default bus lists

[Eduardo Habkost]

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 <aurel...@aurel32.net>
Cc: Yongbok Kim <yongbok....@imgtec.com>
Signed-off-by: Eduardo Habkost <ehabk...@redhat.com>
---
 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