There are currently three types of users of machine_init(): * type_register*() callers * The channel_subsys initialization of at hw/s390x/css.c * qemu_add_opts() callers
This series: * Changes type_register*() callers to use type_init() * Changes s390x/css to simply initialize channel_subsys fields statically * Replaces machine_init() with a new opts_init() helper, after all remaining machine_init() users are just qemu_add_opts() callers Eduardo Habkost (4): machine: Use type_init() to register machine classes s390x/css: Allocate channel_subsys statically s390x/css: Use static initialization for channel_subsys fields module: Rename machine_init() to opts_init() fsdev/qemu-fsdev-opts.c | 2 +- hw/acpi/core.c | 2 +- hw/arm/exynos4_boards.c | 2 +- hw/arm/gumstix.c | 2 +- hw/arm/highbank.c | 2 +- hw/arm/nseries.c | 2 +- hw/arm/omap_sx1.c | 2 +- hw/arm/realview.c | 2 +- hw/arm/spitz.c | 2 +- hw/arm/stellaris.c | 2 +- hw/arm/versatilepb.c | 2 +- hw/arm/vexpress.c | 2 +- hw/arm/virt.c | 2 +- hw/lm32/lm32_boards.c | 2 +- hw/mips/mips_jazz.c | 2 +- hw/ppc/ppc405_boards.c | 2 +- hw/ppc/spapr.c | 2 +- hw/s390x/css.c | 185 +++++++++++++++++++++++------------------------- hw/smbios/smbios.c | 2 +- hw/sparc/sun4m.c | 4 -- hw/sparc64/sun4u.c | 4 -- hw/xtensa/xtfpga.c | 2 +- include/hw/boards.h | 2 +- include/hw/i386/pc.h | 2 +- include/qemu/module.h | 4 +- ui/spice-core.c | 2 +- ui/vnc.c | 2 +- vl.c | 2 +- 28 files changed, 116 insertions(+), 129 deletions(-) -- 2.1.0