motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-07 09:43:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

pc: Don't use QEMUMachine anymore

Browse source 
Now that we have a DEFINE_PC_MACHINE helper macro that just requires an
initialization function, it is trivial to convert them to register a QOM
machine class directly, instead of using QEMUMachine.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Eduardo Habkost 2015-05-15 14:18:56 -03:00 • committed by Michael S. Tsirkin
parent 25519b062c
commit 865906f7fd
3 changed files with 47 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

22
include/hw/i386/pc.h
View file

@ -517,12 +517,12 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *);
.value = stringify(0),\
},
static inline void pc_common_machine_options(QEMUMachine *m)
static inline void pc_common_machine_options(MachineClass *m)
{
m->default_boot_order = "cad";
}
static inline void pc_default_machine_options(QEMUMachine *m)
static inline void pc_default_machine_options(MachineClass *m)
{
pc_common_machine_options(m);
m->hot_add_cpu = pc_hot_add_cpu;
@ -530,13 +530,21 @@ static inline void pc_default_machine_options(QEMUMachine *m)
}
#define DEFINE_PC_MACHINE(suffix, namestr, initfn, optsfn) \
static void pc_machine_##suffix##_class_init(ObjectClass *oc, void *data) \
{ \
MachineClass *mc = MACHINE_CLASS(oc); \
optsfn(mc); \
mc->name = namestr; \
mc->init = initfn; \
} \
static const TypeInfo pc_machine_type_##suffix = { \
.name = namestr TYPE_MACHINE_SUFFIX, \
.parent = TYPE_PC_MACHINE, \
.class_init = pc_machine_##suffix##_class_init, \
}; \
static void pc_machine_init_##suffix(void) \
{ \
static QEMUMachine m = { }; \
optsfn(&m); \
m.name = namestr; \
m.init = initfn; \
qemu_register_pc_machine(&m); \
type_register(&pc_machine_type_##suffix); \
} \
machine_init(pc_machine_init_##suffix)