[Qemu-devel] [RFC 14/15] ppc: Initialize default bus lists

[Eduardo Habkost <ehabkost@redhat.com>]

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 ppci in qmp-machine-info.py).

Cc: Alexander Graf <agraf@suse.de>
Cc: Scott Wood <scottwood@freescale.com>
Cc: David Gibson <david@gibson.dropbear.id.au>
Cc: qemu-ppc@nongnu.org
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 hw/ppc/e500plat.c      | 3 +++
 hw/ppc/mac_newworld.c  | 4 ++++
 hw/ppc/mac_oldworld.c  | 3 +++
 hw/ppc/mpc8544ds.c     | 4 ++++
 hw/ppc/ppc440_bamboo.c | 1 +
 hw/ppc/prep.c          | 4 ++++
 6 files changed, 19 insertions(+)

diff --git a/hw/ppc/e500plat.c b/hw/ppc/e500plat.c
index 94b4545..015e1a1 100644
--- a/hw/ppc/e500plat.c
+++ b/hw/ppc/e500plat.c
@@ -17,6 +17,7 @@
 #include "sysemu/kvm.h"
 #include "hw/pci/pci.h"
 #include "hw/ppc/openpic.h"
+#include "hw/virtio/virtio-bus.h"
 #include "kvm_ppc.h"
 
 static void e500plat_fixup_devtree(PPCE500Params *params, void *fdt)
@@ -64,6 +65,8 @@ static void e500plat_machine_init(MachineClass *mc)
     mc->init = e500plat_init;
     mc->max_cpus = 32;
     mc->has_dynamic_sysbus = true;
+    machine_class_add_default_bus(mc, TYPE_PCI_BUS);
+    machine_class_add_default_bus(mc, TYPE_VIRTIO_BUS);
 }
 
 DEFINE_MACHINE("ppce500", e500plat_machine_init)
diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
index 2bfdb64..cbe510e 100644
--- a/hw/ppc/mac_newworld.c
+++ b/hw/ppc/mac_newworld.c
@@ -521,6 +521,10 @@ static void core99_machine_class_init(ObjectClass *oc, void *data)
     mc->max_cpus = MAX_CPUS;
     mc->default_boot_order = "cd";
     mc->kvm_type = core99_kvm_type;
+    machine_class_add_default_bus(mc, TYPE_IDE_BUS);
+    machine_class_add_default_bus(mc, TYPE_ADB_BUS);
+    machine_class_add_default_bus(mc, TYPE_PCI_BUS);
+    machine_class_add_default_bus(mc, TYPE_USB_BUS);
 }
 
 static const TypeInfo core99_machine_info = {
diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c
index 56282c5..f281555 100644
--- a/hw/ppc/mac_oldworld.c
+++ b/hw/ppc/mac_oldworld.c
@@ -375,6 +375,9 @@ static void heathrow_machine_init(MachineClass *mc)
     /* TOFIX "cad" when Mac floppy is implemented */
     mc->default_boot_order = "cd";
     mc->kvm_type = heathrow_kvm_type;
+    machine_class_add_default_bus(mc, TYPE_IDE_BUS);
+    machine_class_add_default_bus(mc, TYPE_ADB_BUS);
+    machine_class_add_default_bus(mc, TYPE_PCI_BUS);
 }
 
 DEFINE_MACHINE("g3beige", heathrow_machine_init)
diff --git a/hw/ppc/mpc8544ds.c b/hw/ppc/mpc8544ds.c
index 27b8289..3cef73a 100644
--- a/hw/ppc/mpc8544ds.c
+++ b/hw/ppc/mpc8544ds.c
@@ -15,6 +15,8 @@
 #include "hw/boards.h"
 #include "sysemu/device_tree.h"
 #include "hw/ppc/openpic.h"
+#include "hw/pci/pci.h"
+#include "hw/virtio/virtio-bus.h"
 #include "qemu/error-report.h"
 
 static void mpc8544ds_fixup_devtree(PPCE500Params *params, void *fdt)
@@ -55,6 +57,8 @@ static void ppce500_machine_init(MachineClass *mc)
     mc->desc = "mpc8544ds";
     mc->init = mpc8544ds_init;
     mc->max_cpus = 15;
+    machine_class_add_default_bus(mc, TYPE_PCI_BUS);
+    machine_class_add_default_bus(mc, TYPE_VIRTIO_BUS);
 }
 
 DEFINE_MACHINE("mpc8544ds", ppce500_machine_init)
diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c
index 5c535b1..73e812b 100644
--- a/hw/ppc/ppc440_bamboo.c
+++ b/hw/ppc/ppc440_bamboo.c
@@ -295,6 +295,7 @@ static void bamboo_machine_init(MachineClass *mc)
 {
     mc->desc = "bamboo";
     mc->init = bamboo_init;
+    machine_class_add_default_bus(mc, TYPE_PCI_BUS);
 }
 
 DEFINE_MACHINE("bamboo", bamboo_machine_init)
diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c
index 054af1e..04cd7f4 100644
--- a/hw/ppc/prep.c
+++ b/hw/ppc/prep.c
@@ -675,6 +675,10 @@ static void prep_machine_init(MachineClass *mc)
     mc->init = ppc_prep_init;
     mc->max_cpus = MAX_CPUS;
     mc->default_boot_order = "cad";
+    machine_class_add_default_bus(mc, "floppy-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
 }
 
 DEFINE_MACHINE("prep", prep_machine_init)
-- 
2.7.4