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 arm in qmp-machine-info.py).
Cc: Peter Maydell <peter.mayd...@linaro.org> Cc: Beniamino Galvani <b.galv...@gmail.com> Cc: Igor Mitsyanko <i.mitsya...@gmail.com> Cc: Rob Herring <r...@kernel.org> Cc: Peter Chubb <peter.ch...@nicta.com.au> Cc: Jan Kiszka <jan.kis...@web.de> Cc: Andrzej Zaborowski <balr...@gmail.com> Cc: qemu-...@nongnu.org Signed-off-by: Eduardo Habkost <ehabk...@redhat.com> --- hw/arm/aspeed.c | 2 ++ hw/arm/collie.c | 1 + hw/arm/cubieboard.c | 1 + hw/arm/exynos4_boards.c | 5 +++++ hw/arm/gumstix.c | 7 +++++++ hw/arm/highbank.c | 4 ++++ hw/arm/imx25_pdk.c | 1 + hw/arm/kzm.c | 1 + hw/arm/musicpal.c | 1 + hw/arm/nseries.c | 2 ++ hw/arm/palm.c | 1 + hw/arm/realview.c | 1 + hw/arm/spitz.c | 10 ++++++++++ hw/arm/stellaris.c | 4 ++++ 14 files changed, 41 insertions(+) diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c index c7206fd..042f2d0 100644 --- a/hw/arm/aspeed.c +++ b/hw/arm/aspeed.c @@ -180,6 +180,8 @@ static void ast2500_evb_class_init(ObjectClass *oc, void *data) mc->no_floppy = 1; mc->no_cdrom = 1; mc->no_parallel = 1; + machine_class_add_default_bus(mc, "i2c-bus");//FIXME: use macro + machine_class_add_default_bus(mc, "SSI");//FIXME: use macro } static const TypeInfo ast2500_evb_type = { diff --git a/hw/arm/collie.c b/hw/arm/collie.c index 2e69531..049be5d 100644 --- a/hw/arm/collie.c +++ b/hw/arm/collie.c @@ -64,6 +64,7 @@ static void collie_machine_init(MachineClass *mc) { mc->desc = "Sharp SL-5500 (Collie) PDA (SA-1110)"; mc->init = collie_init; + machine_class_add_default_bus(mc, "SSI");//FIXME: use macro } DEFINE_MACHINE("collie", collie_machine_init) diff --git a/hw/arm/cubieboard.c b/hw/arm/cubieboard.c index dd19ba3..7f3841d 100644 --- a/hw/arm/cubieboard.c +++ b/hw/arm/cubieboard.c @@ -82,6 +82,7 @@ static void cubieboard_machine_init(MachineClass *mc) { mc->desc = "cubietech cubieboard"; mc->init = cubieboard_init; + machine_class_add_default_bus(mc, TYPE_IDE_BUS);//FIXME: use macro } DEFINE_MACHINE("cubieboard", cubieboard_machine_init) diff --git a/hw/arm/exynos4_boards.c b/hw/arm/exynos4_boards.c index 0efa194..321895d 100644 --- a/hw/arm/exynos4_boards.c +++ b/hw/arm/exynos4_boards.c @@ -32,6 +32,7 @@ #include "exec/address-spaces.h" #include "hw/arm/exynos4210.h" #include "hw/boards.h" +#include "hw/usb.h" #undef DEBUG @@ -154,6 +155,8 @@ static void nuri_class_init(ObjectClass *oc, void *data) mc->desc = "Samsung NURI board (Exynos4210)"; mc->init = nuri_init; mc->max_cpus = EXYNOS4210_NCPUS; + machine_class_add_default_bus(mc, "i2c-bus");//FIXME: use macro + machine_class_add_default_bus(mc, TYPE_USB_BUS); } static const TypeInfo nuri_type = { @@ -169,6 +172,8 @@ static void smdkc210_class_init(ObjectClass *oc, void *data) mc->desc = "Samsung SMDKC210 board (Exynos4210)"; mc->init = smdkc210_init; mc->max_cpus = EXYNOS4210_NCPUS; + machine_class_add_default_bus(mc, "i2c-bus");//FIXME: use macro + machine_class_add_default_bus(mc, TYPE_USB_BUS); } static const TypeInfo smdkc210_type = { diff --git a/hw/arm/gumstix.c b/hw/arm/gumstix.c index d59d9ba..9e07d75 100644 --- a/hw/arm/gumstix.c +++ b/hw/arm/gumstix.c @@ -41,6 +41,7 @@ #include "hw/block/flash.h" #include "hw/devices.h" #include "hw/boards.h" +#include "hw/usb.h" #include "sysemu/block-backend.h" #include "exec/address-spaces.h" #include "sysemu/qtest.h" @@ -128,6 +129,9 @@ static void connex_class_init(ObjectClass *oc, void *data) mc->desc = "Gumstix Connex (PXA255)"; mc->init = connex_init; + machine_class_add_default_bus(mc, "i2c-bus");//FIXME: use macro + machine_class_add_default_bus(mc, TYPE_USB_BUS); + machine_class_add_default_bus(mc, "SSI");//FIXME: use macro } static const TypeInfo connex_type = { @@ -142,6 +146,9 @@ static void verdex_class_init(ObjectClass *oc, void *data) mc->desc = "Gumstix Verdex (PXA270)"; mc->init = verdex_init; + machine_class_add_default_bus(mc, "i2c-bus");//FIXME: use macro + machine_class_add_default_bus(mc, TYPE_USB_BUS); + machine_class_add_default_bus(mc, "SSI");//FIXME: use macro } static const TypeInfo verdex_type = { diff --git a/hw/arm/highbank.c b/hw/arm/highbank.c index 80e5fd4..30ce089 100644 --- a/hw/arm/highbank.c +++ b/hw/arm/highbank.c @@ -407,6 +407,8 @@ static void highbank_class_init(ObjectClass *oc, void *data) mc->init = highbank_init; mc->block_default_type = IF_SCSI; mc->max_cpus = 4; + machine_class_add_default_bus(mc, "SSI");//FIXME: use macro + machine_class_add_default_bus(mc, "IDE");//FIXME: use macro } static const TypeInfo highbank_type = { @@ -423,6 +425,8 @@ static void midway_class_init(ObjectClass *oc, void *data) mc->init = midway_init; mc->block_default_type = IF_SCSI; mc->max_cpus = 4; + machine_class_add_default_bus(mc, "SSI");//FIXME: use macro + machine_class_add_default_bus(mc, "IDE");//FIXME: use macro } static const TypeInfo midway_type = { diff --git a/hw/arm/imx25_pdk.c b/hw/arm/imx25_pdk.c index 025b608..e29f9d4 100644 --- a/hw/arm/imx25_pdk.c +++ b/hw/arm/imx25_pdk.c @@ -148,6 +148,7 @@ static void imx25_pdk_machine_init(MachineClass *mc) { mc->desc = "ARM i.MX25 PDK board (ARM926)"; mc->init = imx25_pdk_init; + machine_class_add_default_bus(mc, "i2c-bus");//FIXME: use macro } DEFINE_MACHINE("imx25-pdk", imx25_pdk_machine_init) diff --git a/hw/arm/kzm.c b/hw/arm/kzm.c index 2c96ee3..004f303 100644 --- a/hw/arm/kzm.c +++ b/hw/arm/kzm.c @@ -142,6 +142,7 @@ static void kzm_machine_init(MachineClass *mc) { mc->desc = "ARM KZM Emulation Baseboard (ARM1136)"; mc->init = kzm_init; + machine_class_add_default_bus(mc, "i2c-bus");//FIXME: use macro } DEFINE_MACHINE("kzm", kzm_machine_init) diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c index cbbca4e..7ff117c 100644 --- a/hw/arm/musicpal.c +++ b/hw/arm/musicpal.c @@ -1719,6 +1719,7 @@ static void musicpal_machine_init(MachineClass *mc) { mc->desc = "Marvell 88w8618 / MusicPal (ARM926EJ-S)"; mc->init = musicpal_init; + machine_class_add_default_bus(mc, "i2c-bus");//FIXME: use macro } DEFINE_MACHINE("musicpal", musicpal_machine_init) diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c index c86cf80..0df490f 100644 --- a/hw/arm/nseries.c +++ b/hw/arm/nseries.c @@ -1425,6 +1425,7 @@ static void n800_class_init(ObjectClass *oc, void *data) mc->desc = "Nokia N800 tablet aka. RX-34 (OMAP2420)"; mc->init = n800_init; mc->default_boot_order = ""; + machine_class_add_default_bus(mc, "i2c-bus");//FIXME: use macro } static const TypeInfo n800_type = { @@ -1440,6 +1441,7 @@ static void n810_class_init(ObjectClass *oc, void *data) mc->desc = "Nokia N810 tablet aka. RX-44 (OMAP2420)"; mc->init = n810_init; mc->default_boot_order = ""; + machine_class_add_default_bus(mc, "i2c-bus");//FIXME: use macro } static const TypeInfo n810_type = { diff --git a/hw/arm/palm.c b/hw/arm/palm.c index 7f46073..b49c865 100644 --- a/hw/arm/palm.c +++ b/hw/arm/palm.c @@ -275,6 +275,7 @@ static void palmte_machine_init(MachineClass *mc) { mc->desc = "Palm Tungsten|E aka. Cheetah PDA (OMAP310)"; mc->init = palmte_init; + machine_class_add_default_bus(mc, "i2c-bus");//FIXME: use macro } DEFINE_MACHINE("cheetah", palmte_machine_init) diff --git a/hw/arm/realview.c b/hw/arm/realview.c index 8eafcca..a7d8747 100644 --- a/hw/arm/realview.c +++ b/hw/arm/realview.c @@ -445,6 +445,7 @@ static void realview_pbx_a9_class_init(ObjectClass *oc, void *data) mc->init = realview_pbx_a9_init; mc->block_default_type = IF_SCSI; mc->max_cpus = 4; + machine_class_add_default_bus(mc, "i2c-bus");//FIXME: use macro } static const TypeInfo realview_pbx_a9_type = { diff --git a/hw/arm/spitz.c b/hw/arm/spitz.c index 949a15a..6888dff 100644 --- a/hw/arm/spitz.c +++ b/hw/arm/spitz.c @@ -30,6 +30,7 @@ #include "hw/sysbus.h" #include "exec/address-spaces.h" #include "sysemu/sysemu.h" +#include "hw/usb.h" #undef REG_FMT #define REG_FMT "0x%02lx" @@ -984,6 +985,9 @@ static void akitapda_class_init(ObjectClass *oc, void *data) mc->desc = "Sharp SL-C1000 (Akita) PDA (PXA270)"; mc->init = akita_init; + machine_class_add_default_bus(mc, "i2c-bus");//FIXME: use macro + machine_class_add_default_bus(mc, TYPE_USB_BUS); + machine_class_add_default_bus(mc, "SSI");//FIXME: use macro } static const TypeInfo akitapda_type = { @@ -998,6 +1002,9 @@ static void spitzpda_class_init(ObjectClass *oc, void *data) mc->desc = "Sharp SL-C3000 (Spitz) PDA (PXA270)"; mc->init = spitz_init; + machine_class_add_default_bus(mc, "i2c-bus");//FIXME: use macro + machine_class_add_default_bus(mc, TYPE_USB_BUS); + machine_class_add_default_bus(mc, "SSI");//FIXME: use macro } static const TypeInfo spitzpda_type = { @@ -1012,6 +1019,9 @@ static void borzoipda_class_init(ObjectClass *oc, void *data) mc->desc = "Sharp SL-C3100 (Borzoi) PDA (PXA270)"; mc->init = borzoi_init; + machine_class_add_default_bus(mc, "i2c-bus");//FIXME: use macro + machine_class_add_default_bus(mc, TYPE_USB_BUS); + machine_class_add_default_bus(mc, "SSI");//FIXME: use macro } static const TypeInfo borzoipda_type = { diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c index 794a3ad..49b153b 100644 --- a/hw/arm/stellaris.c +++ b/hw/arm/stellaris.c @@ -1393,6 +1393,8 @@ static void lm3s811evb_class_init(ObjectClass *oc, void *data) mc->desc = "Stellaris LM3S811EVB"; mc->init = lm3s811evb_init; + machine_class_add_default_bus(mc, "SSI");//FIXME: use macro + machine_class_add_default_bus(mc, "i2c-bus");//FIXME: use macro } static const TypeInfo lm3s811evb_type = { @@ -1407,6 +1409,8 @@ static void lm3s6965evb_class_init(ObjectClass *oc, void *data) mc->desc = "Stellaris LM3S6965EVB"; mc->init = lm3s6965evb_init; + machine_class_add_default_bus(mc, "SSI");//FIXME: use macro + machine_class_add_default_bus(mc, "i2c-bus");//FIXME: use macro } static const TypeInfo lm3s6965evb_type = { -- 2.7.4