From 25519b062c70f2afe2d2f0c262f3838a41e8bc7c Mon Sep 17 00:00:00 2001 From: Eduardo Habkost Date: Fri, 15 May 2015 14:18:55 -0300 Subject: pc: Move compat_props setting inside *_machine_options() functions This will simplify the DEFINE_PC_MACHINE macro, and will help us to implement reuse of PC_COMPAT_* macros through class_init function reuse, in the future. Signed-off-by: Eduardo Habkost Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- include/hw/i386/pc.h | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'include') diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 7a70d1f8b6..c4f080878d 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -529,20 +529,23 @@ static inline void pc_default_machine_options(QEMUMachine *m) m->max_cpus = 255; } -#define DEFINE_PC_MACHINE(suffix, namestr, initfn, optsfn, COMPAT) \ +#define DEFINE_PC_MACHINE(suffix, namestr, initfn, optsfn) \ static void pc_machine_init_##suffix(void) \ { \ static QEMUMachine m = { }; \ - static GlobalProperty props[] = { \ - COMPAT \ - { /* end of list */ } \ - }; \ optsfn(&m); \ m.name = namestr; \ m.init = initfn; \ - m.compat_props = props; \ qemu_register_pc_machine(&m); \ } \ machine_init(pc_machine_init_##suffix) +#define SET_MACHINE_COMPAT(m, COMPAT) do { \ + static GlobalProperty props[] = { \ + COMPAT \ + { /* end of list */ } \ + }; \ + (m)->compat_props = props; \ +} while (0) + #endif -- cgit v1.2.3-55-g7522