diff options
| author | Eduardo Habkost <ehabkost@redhat.com> | 2016-02-16 18:59:04 -0200 |
|---|---|---|
| committer | Eduardo Habkost <ehabkost@redhat.com> | 2016-03-16 15:34:05 -0300 |
| commit | 0e6aac87fd0f5db2be57c36c03d67388577208a7 (patch) | |
| tree | 6e985fdea319630fe54254df75440deaebf2ab22 /include | |
| parent | d1f8764099022bc1173f2413331b26d4ff609a0c (diff) | |
| download | focaccia-qemu-0e6aac87fd0f5db2be57c36c03d67388577208a7.tar.gz focaccia-qemu-0e6aac87fd0f5db2be57c36c03d67388577208a7.zip | |
machine: Use type_init() to register machine classes
Change all machine_init() users that simply call type_register*() to use type_init(). Cc: Evgeny Voevodin <e.voevodin@samsung.com> Cc: Maksim Kozlov <m.kozlov@samsung.com> Cc: Igor Mitsyanko <i.mitsyanko@gmail.com> Cc: Dmitry Solodkiy <d.solodkiy@samsung.com> Cc: Peter Maydell <peter.maydell@linaro.org> Cc: Rob Herring <robh@kernel.org> Cc: Andrzej Zaborowski <balrogg@gmail.com> Cc: Michael Walle <michael@walle.cc> Cc: "Hervé Poussineau" <hpoussin@reactos.org> Cc: Aurelien Jarno <aurelien@aurel32.net> Cc: Leon Alrae <leon.alrae@imgtec.com> Cc: Alexander Graf <agraf@suse.de> Cc: David Gibson <david@gibson.dropbear.id.au> Cc: Blue Swirl <blauwirbel@gmail.com> Cc: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> Cc: Max Filippov <jcmvbkbc@gmail.com> Cc: "Michael S. Tsirkin" <mst@redhat.com> Acked-by: Marcel Apfelbaum <marcel@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Acked-by: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/boards.h | 2 | ||||
| -rw-r--r-- | include/hw/i386/pc.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/hw/boards.h b/include/hw/boards.h index 4b3fdbea9d..8efce0f91e 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -181,7 +181,7 @@ struct MachineState { { \ type_register_static(&machine_initfn##_typeinfo); \ } \ - machine_init(machine_initfn##_register_types) + type_init(machine_initfn##_register_types) #define SET_MACHINE_COMPAT(m, COMPAT) \ do { \ diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 8c2bf7fd67..847d92f550 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -858,7 +858,7 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *); { \ type_register(&pc_machine_type_##suffix); \ } \ - machine_init(pc_machine_init_##suffix) + type_init(pc_machine_init_##suffix) extern void igd_passthrough_isa_bridge_create(PCIBus *bus, uint16_t gpu_dev_id); #endif |