vitalif
/
mirror_qemu
mirror of https://github.com/proxmox/mirror_qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
master
Eduardo Habkost 2016-02-16 18:59:04 -02:00
parent d1f8764099
commit 0e6aac87fd
21 changed files with 19 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/arm/exynos4_boards.c
View File

@ -181,4 +181,4 @@ static void exynos4_machines_init(void)
type_register_static(&smdkc210_type);
}
machine_init(exynos4_machines_init)
type_init(exynos4_machines_init)

2
hw/arm/gumstix.c
View File

@ -156,4 +156,4 @@ static void gumstix_machine_init(void)
type_register_static(&verdex_type);
}
machine_init(gumstix_machine_init)
type_init(gumstix_machine_init)

2
hw/arm/highbank.c
View File

@ -437,4 +437,4 @@ static void calxeda_machines_init(void)
type_register_static(&midway_type);
}
machine_init(calxeda_machines_init)
type_init(calxeda_machines_init)

2
hw/arm/nseries.c
View File

@ -1450,4 +1450,4 @@ static void nseries_machine_init(void)
type_register_static(&n810_type);
}
machine_init(nseries_machine_init)
type_init(nseries_machine_init)

2
hw/arm/omap_sx1.c
View File

@ -252,4 +252,4 @@ static void sx1_machine_init(void)
type_register_static(&sx1_machine_v2_type);
}
machine_init(sx1_machine_init)
type_init(sx1_machine_init)

2
hw/arm/realview.c
View File

@ -457,4 +457,4 @@ static void realview_machine_init(void)
type_register_static(&realview_pbx_a9_type);
}
machine_init(realview_machine_init)
type_init(realview_machine_init)

2
hw/arm/spitz.c
View File

@ -1037,7 +1037,7 @@ static void spitz_machine_init(void)
type_register_static(&terrierpda_type);
}
machine_init(spitz_machine_init)
type_init(spitz_machine_init)
static bool is_version_0(void *opaque, int version_id)
{

2
hw/arm/stellaris.c
View File

@ -1420,7 +1420,7 @@ static void stellaris_machine_init(void)
type_register_static(&lm3s6965evb_type);
}
machine_init(stellaris_machine_init)
type_init(stellaris_machine_init)
static void stellaris_i2c_class_init(ObjectClass *klass, void *data)
{

2
hw/arm/versatilepb.c
View File

@ -419,7 +419,7 @@ static void versatile_machine_init(void)
type_register_static(&versatileab_type);
}
machine_init(versatile_machine_init)
type_init(versatile_machine_init)
static void vpb_sic_class_init(ObjectClass *klass, void *data)
{

2
hw/arm/vexpress.c
View File

@ -800,4 +800,4 @@ static void vexpress_machine_init(void)
type_register_static(&vexpress_a15_info);
}
machine_init(vexpress_machine_init);
type_init(vexpress_machine_init);

2
hw/arm/virt.c
View File

@ -1428,4 +1428,4 @@ static void machvirt_machine_init(void)
type_register_static(&machvirt_info);
}
machine_init(machvirt_machine_init);
type_init(machvirt_machine_init);

2
hw/lm32/lm32_boards.c
View File

@ -329,4 +329,4 @@ static void lm32_machine_init(void)
type_register_static(&lm32_uclinux_type);
}
machine_init(lm32_machine_init)
type_init(lm32_machine_init)

2
hw/mips/mips_jazz.c
View File

@ -387,4 +387,4 @@ static void mips_jazz_machine_init(void)
type_register_static(&mips_pica61_type);
}
machine_init(mips_jazz_machine_init)
type_init(mips_jazz_machine_init)

2
hw/ppc/ppc405_boards.c
View File

@ -658,4 +658,4 @@ static void ppc405_machine_init(void)
type_register_static(&taihu_type);
}
machine_init(ppc405_machine_init)
type_init(ppc405_machine_init)

2
hw/ppc/spapr.c
View File

@ -2342,7 +2342,7 @@ static const TypeInfo spapr_machine_info = {
{ \
type_register(&spapr_machine_##suffix##_info); \
} \
machine_init(spapr_machine_register_##suffix)
type_init(spapr_machine_register_##suffix)
/*
* pseries-2.6

2
hw/s390x/s390-virtio-ccw.c
View File

@ -294,7 +294,7 @@ static const TypeInfo ccw_machine_info = {
{ \
type_register_static(&ccw_machine_##suffix##_info); \
} \
machine_init(ccw_machine_register_##suffix)
type_init(ccw_machine_register_##suffix)
#define CCW_COMPAT_2_5 \
HW_COMPAT_2_5

4
hw/sparc/sun4m.c
View File

@ -1553,10 +1553,7 @@ static void sun4m_register_types(void)
type_register_static(&afx_info);
type_register_static(&prom_info);
type_register_static(&ram_info);
}
static void sun4m_machine_init(void)
{
type_register_static(&ss5_type);
type_register_static(&ss10_type);
type_register_static(&ss600mp_type);
@ -1569,4 +1566,3 @@ static void sun4m_machine_init(void)
}
type_init(sun4m_register_types)
machine_init(sun4m_machine_init)

4
hw/sparc64/sun4u.c
View File

@ -997,14 +997,10 @@ static void sun4u_register_types(void)
type_register_static(&ebus_info);
type_register_static(&prom_info);
type_register_static(&ram_info);
}
static void sun4u_machine_init(void)
{
type_register_static(&sun4u_type);
type_register_static(&sun4v_type);
type_register_static(&niagara_type);
}
type_init(sun4u_register_types)
machine_init(sun4u_machine_init)

2
hw/xtensa/xtfpga.c
View File

@ -510,4 +510,4 @@ static void xtensa_lx_machines_init(void)
type_register_static(&xtensa_kc705_type);
}
machine_init(xtensa_lx_machines_init)
type_init(xtensa_lx_machines_init)

2
include/hw/boards.h
View File

@ -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 { \

2
include/hw/i386/pc.h
View File

@ -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