OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

pc: Convert *_MACHINE_OPTIONS macros into functions

Browse Source 
By now the new functions will get QEMUMachine as argument, but they will
be later converted to initialize a MachineClass struct directly.

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:54 -03:00 committed by Michael S. Tsirkin
parent 61f219dfb0
commit fddd179ab9
3 changed files with 218 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

227
hw/i386/pc_piix.c
View File

@ -517,82 +517,104 @@ static void pc_xen_hvm_init(MachineState *machine)
}
#endif
#define PC_I440FX_MACHINE_OPTIONS \
PC_DEFAULT_MACHINE_OPTIONS, \
.family = "pc_piix", \
.desc = "Standard PC (i440FX + PIIX, 1996)", \
.hot_add_cpu = pc_hot_add_cpu
#define PC_I440FX_2_4_MACHINE_OPTIONS \
PC_I440FX_MACHINE_OPTIONS, \
.default_machine_opts = "firmware=bios-256k.bin", \
.default_display = "std", \
.alias = "pc", \
.is_default = 1
static void pc_i440fx_machine_options(QEMUMachine *m)
{
pc_default_machine_options(m);
m->family = "pc_piix";
m->desc = "Standard PC (i440FX + PIIX, 1996)";
m->hot_add_cpu = pc_hot_add_cpu;
}
static void pc_i440fx_2_4_machine_options(QEMUMachine *m)
{
pc_i440fx_machine_options(m);
m->default_machine_opts = "firmware=bios-256k.bin";
m->default_display = "std";
m->alias = "pc";
m->is_default = 1;
}
DEFINE_PC_MACHINE(v2_4, "pc-i440fx-2.4", pc_init_pci,
PC_I440FX_2_4_MACHINE_OPTIONS, /* no compat */)
pc_i440fx_2_4_machine_options, /* no compat */)
#define PC_I440FX_2_3_MACHINE_OPTIONS \
PC_I440FX_2_4_MACHINE_OPTIONS, \
.alias = NULL, \
.is_default = 0
static void pc_i440fx_2_3_machine_options(QEMUMachine *m)
{
pc_i440fx_machine_options(m);
m->alias = NULL;
m->is_default = 0;
}
DEFINE_PC_MACHINE(v2_3, "pc-i440fx-2.3", pc_init_pci_2_3,
PC_I440FX_2_3_MACHINE_OPTIONS, PC_COMPAT_2_3);
pc_i440fx_2_3_machine_options, PC_COMPAT_2_3);
#define PC_I440FX_2_2_MACHINE_OPTIONS \
PC_I440FX_2_3_MACHINE_OPTIONS
static void pc_i440fx_2_2_machine_options(QEMUMachine *m)
{
pc_i440fx_2_3_machine_options(m);
}
DEFINE_PC_MACHINE(v2_2, "pc-i440fx-2.2", pc_init_pci_2_2,
PC_I440FX_2_2_MACHINE_OPTIONS, PC_COMPAT_2_2);
pc_i440fx_2_2_machine_options, PC_COMPAT_2_2);
#define PC_I440FX_2_1_MACHINE_OPTIONS \
PC_I440FX_2_2_MACHINE_OPTIONS, \
.default_display = NULL
static void pc_i440fx_2_1_machine_options(QEMUMachine *m)
{
pc_i440fx_2_2_machine_options(m);
m->default_display = NULL;
}
DEFINE_PC_MACHINE(v2_1, "pc-i440fx-2.1", pc_init_pci_2_1,
PC_I440FX_2_1_MACHINE_OPTIONS, PC_COMPAT_2_1);
pc_i440fx_2_1_machine_options, PC_COMPAT_2_1);
#define PC_I440FX_2_0_MACHINE_OPTIONS \
PC_I440FX_2_1_MACHINE_OPTIONS
static void pc_i440fx_2_0_machine_options(QEMUMachine *m)
{
pc_i440fx_2_1_machine_options(m);
}
DEFINE_PC_MACHINE(v2_0, "pc-i440fx-2.0", pc_init_pci_2_0,
PC_I440FX_2_0_MACHINE_OPTIONS, PC_COMPAT_2_0);
pc_i440fx_2_0_machine_options, PC_COMPAT_2_0);
#define PC_I440FX_1_7_MACHINE_OPTIONS \
PC_I440FX_2_0_MACHINE_OPTIONS, \
.default_machine_opts = NULL
static void pc_i440fx_1_7_machine_options(QEMUMachine *m)
{
pc_i440fx_2_0_machine_options(m);
m->default_machine_opts = NULL;
}
DEFINE_PC_MACHINE(v1_7, "pc-i440fx-1.7", pc_init_pci_1_7,
PC_I440FX_1_7_MACHINE_OPTIONS, PC_COMPAT_1_7);
pc_i440fx_1_7_machine_options, PC_COMPAT_1_7);
#define PC_I440FX_1_6_MACHINE_OPTIONS \
PC_I440FX_1_7_MACHINE_OPTIONS
static void pc_i440fx_1_6_machine_options(QEMUMachine *m)
{
pc_i440fx_1_7_machine_options(m);
}
DEFINE_PC_MACHINE(v1_6, "pc-i440fx-1.6", pc_init_pci_1_6,
PC_I440FX_1_6_MACHINE_OPTIONS, PC_COMPAT_1_6);
pc_i440fx_1_6_machine_options, PC_COMPAT_1_6);
#define PC_I440FX_1_5_MACHINE_OPTIONS \
PC_I440FX_1_6_MACHINE_OPTIONS
static void pc_i440fx_1_5_machine_options(QEMUMachine *m)
{
pc_i440fx_1_6_machine_options(m);
}
DEFINE_PC_MACHINE(v1_5, "pc-i440fx-1.5", pc_init_pci_1_5,
PC_I440FX_1_5_MACHINE_OPTIONS, PC_COMPAT_1_5);
pc_i440fx_1_5_machine_options, PC_COMPAT_1_5);
#define PC_I440FX_1_4_MACHINE_OPTIONS \
PC_I440FX_1_5_MACHINE_OPTIONS, \
.hot_add_cpu = NULL
static void pc_i440fx_1_4_machine_options(QEMUMachine *m)
{
pc_i440fx_1_5_machine_options(m);
m->hot_add_cpu = NULL;
}
DEFINE_PC_MACHINE(v1_4, "pc-i440fx-1.4", pc_init_pci_1_4,
PC_I440FX_1_4_MACHINE_OPTIONS, PC_COMPAT_1_4);
pc_i440fx_1_4_machine_options, PC_COMPAT_1_4);
#define PC_COMPAT_1_3 \
@ -615,11 +637,14 @@ DEFINE_PC_MACHINE(v1_4, "pc-i440fx-1.4", pc_init_pci_1_4,
.value = "off",\
},
#define PC_I440FX_1_3_MACHINE_OPTIONS \
PC_I440FX_1_4_MACHINE_OPTIONS
static void pc_i440fx_1_3_machine_options(QEMUMachine *m)
{
pc_i440fx_1_4_machine_options(m);
}
DEFINE_PC_MACHINE(v1_3, "pc-1.3", pc_init_pci_1_3,
PC_I440FX_1_3_MACHINE_OPTIONS, PC_COMPAT_1_3);
pc_i440fx_1_3_machine_options, PC_COMPAT_1_3);
#define PC_COMPAT_1_2 \
@ -650,11 +675,13 @@ DEFINE_PC_MACHINE(v1_3, "pc-1.3", pc_init_pci_1_3,
.value = "off",\
},
#define PC_I440FX_1_2_MACHINE_OPTIONS \
PC_I440FX_1_3_MACHINE_OPTIONS
static void pc_i440fx_1_2_machine_options(QEMUMachine *m)
{
pc_i440fx_1_3_machine_options(m);
}
DEFINE_PC_MACHINE(v1_2, "pc-1.2", pc_init_pci_1_2,
PC_I440FX_1_2_MACHINE_OPTIONS, PC_COMPAT_1_2);
pc_i440fx_1_2_machine_options, PC_COMPAT_1_2);
#define PC_COMPAT_1_1 \
@ -689,11 +716,13 @@ DEFINE_PC_MACHINE(v1_2, "pc-1.2", pc_init_pci_1_2,
.value = "off",\
},
#define PC_I440FX_1_1_MACHINE_OPTIONS \
PC_I440FX_1_2_MACHINE_OPTIONS
static void pc_i440fx_1_1_machine_options(QEMUMachine *m)
{
pc_i440fx_1_2_machine_options(m);
}
DEFINE_PC_MACHINE(v1_1, "pc-1.1", pc_init_pci_1_2,
PC_I440FX_1_1_MACHINE_OPTIONS, PC_COMPAT_1_1);
pc_i440fx_1_1_machine_options, PC_COMPAT_1_1);
#define PC_COMPAT_1_0 \
@ -716,23 +745,27 @@ DEFINE_PC_MACHINE(v1_1, "pc-1.1", pc_init_pci_1_2,
.value = "no",\
},
#define PC_I440FX_1_0_MACHINE_OPTIONS \
PC_I440FX_1_1_MACHINE_OPTIONS, \
.hw_version = "1.0"
static void pc_i440fx_1_0_machine_options(QEMUMachine *m)
{
pc_i440fx_1_1_machine_options(m);
m->hw_version = "1.0";
}
DEFINE_PC_MACHINE(v1_0, "pc-1.0", pc_init_pci_1_2,
PC_I440FX_1_0_MACHINE_OPTIONS, PC_COMPAT_1_0);
pc_i440fx_1_0_machine_options, PC_COMPAT_1_0);
#define PC_COMPAT_0_15 \
PC_COMPAT_1_0
#define PC_I440FX_0_15_MACHINE_OPTIONS \
PC_I440FX_1_0_MACHINE_OPTIONS, \
.hw_version = "0.15"
static void pc_i440fx_0_15_machine_options(QEMUMachine *m)
{
pc_i440fx_1_0_machine_options(m);
m->hw_version = "0.15";
}
DEFINE_PC_MACHINE(v0_15, "pc-0.15", pc_init_pci_1_2,
PC_I440FX_0_15_MACHINE_OPTIONS, PC_COMPAT_0_15);
pc_i440fx_0_15_machine_options, PC_COMPAT_0_15);
#define PC_COMPAT_0_14 \
@ -763,12 +796,14 @@ DEFINE_PC_MACHINE(v0_15, "pc-0.15", pc_init_pci_1_2,
.value = stringify(2),\
},
#define PC_I440FX_0_14_MACHINE_OPTIONS \
PC_I440FX_0_15_MACHINE_OPTIONS, \
.hw_version = "0.14"
static void pc_i440fx_0_14_machine_options(QEMUMachine *m)
{
pc_i440fx_0_15_machine_options(m);
m->hw_version = "0.14";
}
DEFINE_PC_MACHINE(v0_14, "pc-0.14", pc_init_pci_1_2,
PC_I440FX_0_14_MACHINE_OPTIONS, PC_COMPAT_0_14);
pc_i440fx_0_14_machine_options, PC_COMPAT_0_14);
#define PC_COMPAT_0_13 \
@ -795,12 +830,14 @@ DEFINE_PC_MACHINE(v0_14, "pc-0.14", pc_init_pci_1_2,
.value = stringify(0),\
},
#define PC_I440FX_0_13_MACHINE_OPTIONS \
PC_I440FX_0_14_MACHINE_OPTIONS, \
.hw_version = "0.13"
static void pc_i440fx_0_13_machine_options(QEMUMachine *m)
{
pc_i440fx_0_14_machine_options(m);
m->hw_version = "0.13";
}
DEFINE_PC_MACHINE(v0_13, "pc-0.13", pc_init_pci_no_kvmclock,
PC_I440FX_0_13_MACHINE_OPTIONS, PC_COMPAT_0_13);
pc_i440fx_0_13_machine_options, PC_COMPAT_0_13);
#define PC_COMPAT_0_12 \
@ -827,12 +864,14 @@ DEFINE_PC_MACHINE(v0_13, "pc-0.13", pc_init_pci_no_kvmclock,
.value = "1",\
},
#define PC_I440FX_0_12_MACHINE_OPTIONS \
PC_I440FX_0_13_MACHINE_OPTIONS, \
.hw_version = "0.12"
static void pc_i440fx_0_12_machine_options(QEMUMachine *m)
{
pc_i440fx_0_13_machine_options(m);
m->hw_version = "0.12";
}
DEFINE_PC_MACHINE(v0_12, "pc-0.12", pc_init_pci_no_kvmclock,
PC_I440FX_0_12_MACHINE_OPTIONS, PC_COMPAT_0_12);
pc_i440fx_0_12_machine_options, PC_COMPAT_0_12);
#define PC_COMPAT_0_11 \
@ -855,12 +894,14 @@ DEFINE_PC_MACHINE(v0_12, "pc-0.12", pc_init_pci_no_kvmclock,
.value = "0.11",\
},
#define PC_I440FX_0_11_MACHINE_OPTIONS \
PC_I440FX_0_12_MACHINE_OPTIONS, \
.hw_version = "0.11"
static void pc_i440fx_0_11_machine_options(QEMUMachine *m)
{
pc_i440fx_0_12_machine_options(m);
m->hw_version = "0.11";
}
DEFINE_PC_MACHINE(v0_11, "pc-0.11", pc_init_pci_no_kvmclock,
PC_I440FX_0_11_MACHINE_OPTIONS, PC_COMPAT_0_11);
pc_i440fx_0_11_machine_options, PC_COMPAT_0_11);
#define PC_COMPAT_0_10 \
@ -887,31 +928,37 @@ DEFINE_PC_MACHINE(v0_11, "pc-0.11", pc_init_pci_no_kvmclock,
.value = "0.10",\
},
#define PC_I440FX_0_10_MACHINE_OPTIONS \
PC_I440FX_0_11_MACHINE_OPTIONS, \
.hw_version = "0.10"
static void pc_i440fx_0_10_machine_options(QEMUMachine *m)
{
pc_i440fx_0_11_machine_options(m);
m->hw_version = "0.10";
}
DEFINE_PC_MACHINE(v0_10, "pc-0.10", pc_init_pci_no_kvmclock,
PC_I440FX_0_10_MACHINE_OPTIONS, PC_COMPAT_0_10);
pc_i440fx_0_10_machine_options, PC_COMPAT_0_10);
#define ISAPC_MACHINE_OPTIONS \
PC_COMMON_MACHINE_OPTIONS, \
.desc = "ISA-only PC", \
.max_cpus = 1
static void isapc_machine_options(QEMUMachine *m)
{
pc_common_machine_options(m);
m->desc = "ISA-only PC";
m->max_cpus = 1;
}
DEFINE_PC_MACHINE(isapc, "isapc", pc_init_isa,
ISAPC_MACHINE_OPTIONS, /* no compat */);
isapc_machine_options, /* no compat */);
#ifdef CONFIG_XEN
#define XENFV_MACHINE_OPTIONS \
PC_COMMON_MACHINE_OPTIONS, \
.desc = "Xen Fully-virtualized PC", \
.max_cpus = HVM_MAX_VCPUS, \
.default_machine_opts = "accel=xen", \
.hot_add_cpu = pc_hot_add_cpu
static void xenfv_machine_options(QEMUMachine *m)
{
pc_common_machine_options(m);
m->desc = "Xen Fully-virtualized PC";
m->max_cpus = HVM_MAX_VCPUS;
m->default_machine_opts = "accel=xen";
m->hot_add_cpu = pc_hot_add_cpu;
}
DEFINE_PC_MACHINE(xenfv, "xenfv", pc_xen_hvm_init,
XENFV_MACHINE_OPTIONS, /* no compat */);
xenfv_machine_options, /* no compat */);
#endif

100
hw/i386/pc_q35.c
View File

@ -414,78 +414,98 @@ static void pc_q35_init_1_4(MachineState *machine)
pc_q35_init(machine);
}
#define PC_Q35_MACHINE_OPTIONS \
PC_DEFAULT_MACHINE_OPTIONS, \
.family = "pc_q35", \
.desc = "Standard PC (Q35 + ICH9, 2009)", \
.hot_add_cpu = pc_hot_add_cpu, \
.units_per_default_bus = 1
static void pc_q35_machine_options(QEMUMachine *m)
{
pc_default_machine_options(m);
m->family = "pc_q35";
m->desc = "Standard PC (Q35 + ICH9, 2009)";
m->hot_add_cpu = pc_hot_add_cpu;
m->units_per_default_bus = 1;
}
#define PC_Q35_2_4_MACHINE_OPTIONS \
PC_Q35_MACHINE_OPTIONS, \
.default_machine_opts = "firmware=bios-256k.bin", \
.default_display = "std", \
.alias = "q35"
static void pc_q35_2_4_machine_options(QEMUMachine *m)
{
pc_q35_machine_options(m);
m->default_machine_opts = "firmware=bios-256k.bin";
m->default_display = "std";
m->alias = "q35";
}
DEFINE_PC_MACHINE(v2_4, "pc-q35-2.4", pc_q35_init,
PC_Q35_2_4_MACHINE_OPTIONS, /* no compat */);
pc_q35_2_4_machine_options, /* no compat */);
#define PC_Q35_2_3_MACHINE_OPTIONS \
PC_Q35_2_4_MACHINE_OPTIONS, \
.alias = NULL
static void pc_q35_2_3_machine_options(QEMUMachine *m)
{
pc_q35_2_4_machine_options(m);
m->alias = NULL;
}
DEFINE_PC_MACHINE(v2_3, "pc-q35-2.3", pc_q35_init_2_3,
PC_Q35_2_3_MACHINE_OPTIONS, PC_COMPAT_2_3);
pc_q35_2_3_machine_options, PC_COMPAT_2_3);
#define PC_Q35_2_2_MACHINE_OPTIONS \
PC_Q35_2_3_MACHINE_OPTIONS
static void pc_q35_2_2_machine_options(QEMUMachine *m)
{
pc_q35_2_3_machine_options(m);
}
DEFINE_PC_MACHINE(v2_2, "pc-q35-2.2", pc_q35_init_2_2,
PC_Q35_2_2_MACHINE_OPTIONS, PC_COMPAT_2_2);
pc_q35_2_2_machine_options, PC_COMPAT_2_2);
#define PC_Q35_2_1_MACHINE_OPTIONS \
PC_Q35_2_2_MACHINE_OPTIONS, \
.default_display = NULL
static void pc_q35_2_1_machine_options(QEMUMachine *m)
{
pc_q35_2_2_machine_options(m);
m->default_display = NULL;
}
DEFINE_PC_MACHINE(v2_1, "pc-q35-2.1", pc_q35_init_2_1,
PC_Q35_2_1_MACHINE_OPTIONS, PC_COMPAT_2_1);
pc_q35_2_1_machine_options, PC_COMPAT_2_1);
#define PC_Q35_2_0_MACHINE_OPTIONS \
PC_Q35_2_1_MACHINE_OPTIONS
static void pc_q35_2_0_machine_options(QEMUMachine *m)
{
pc_q35_2_1_machine_options(m);
}
DEFINE_PC_MACHINE(v2_0, "pc-q35-2.0", pc_q35_init_2_0,
PC_Q35_2_0_MACHINE_OPTIONS, PC_COMPAT_2_0);
pc_q35_2_0_machine_options, PC_COMPAT_2_0);
#define PC_Q35_1_7_MACHINE_OPTIONS \
PC_Q35_2_0_MACHINE_OPTIONS, \
.default_machine_opts = NULL
static void pc_q35_1_7_machine_options(QEMUMachine *m)
{
pc_q35_2_0_machine_options(m);
m->default_machine_opts = NULL;
}
DEFINE_PC_MACHINE(v1_7, "pc-q35-1.7", pc_q35_init_1_7,
PC_Q35_1_7_MACHINE_OPTIONS, PC_COMPAT_1_7);
pc_q35_1_7_machine_options, PC_COMPAT_1_7);
#define PC_Q35_1_6_MACHINE_OPTIONS \
PC_Q35_MACHINE_OPTIONS
static void pc_q35_1_6_machine_options(QEMUMachine *m)
{
pc_q35_machine_options(m);
}
DEFINE_PC_MACHINE(v1_6, "pc-q35-1.6", pc_q35_init_1_6,
PC_Q35_1_6_MACHINE_OPTIONS, PC_COMPAT_1_6);
pc_q35_1_6_machine_options, PC_COMPAT_1_6);
#define PC_Q35_1_5_MACHINE_OPTIONS \
PC_Q35_1_6_MACHINE_OPTIONS
static void pc_q35_1_5_machine_options(QEMUMachine *m)
{
pc_q35_1_6_machine_options(m);
}
DEFINE_PC_MACHINE(v1_5, "pc-q35-1.5", pc_q35_init_1_5,
PC_Q35_1_5_MACHINE_OPTIONS, PC_COMPAT_1_5);
pc_q35_1_5_machine_options, PC_COMPAT_1_5);
#define PC_Q35_1_4_MACHINE_OPTIONS \
PC_Q35_1_5_MACHINE_OPTIONS, \
.hot_add_cpu = NULL
static void pc_q35_1_4_machine_options(QEMUMachine *m)
{
pc_q35_1_5_machine_options(m);
m->hot_add_cpu = NULL;
}
DEFINE_PC_MACHINE(v1_4, "pc-q35-1.4", pc_q35_init_1_4,
PC_Q35_1_4_MACHINE_OPTIONS, PC_COMPAT_1_4);
pc_q35_1_4_machine_options, PC_COMPAT_1_4);

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

@ -517,27 +517,31 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *);
.value = stringify(0),\
},
#define PC_COMMON_MACHINE_OPTIONS \
.default_boot_order = "cad"
static inline void pc_common_machine_options(QEMUMachine *m)
{
m->default_boot_order = "cad";
}
#define PC_DEFAULT_MACHINE_OPTIONS \
PC_COMMON_MACHINE_OPTIONS, \
.hot_add_cpu = pc_hot_add_cpu, \
.max_cpus = 255
static inline void pc_default_machine_options(QEMUMachine *m)
{
pc_common_machine_options(m);
m->hot_add_cpu = pc_hot_add_cpu;
m->max_cpus = 255;
}
#define DEFINE_PC_MACHINE(suffix, namestr, initfn, OPTS, COMPAT) \
static QEMUMachine pc_machine_##suffix = { \
OPTS, \
.name = namestr, \
.init = initfn, \
.compat_props = (GlobalProperty[]) { \
COMPAT \
{ /* end of list */ } \
}, \
}; \
#define DEFINE_PC_MACHINE(suffix, namestr, initfn, optsfn, COMPAT) \
static void pc_machine_init_##suffix(void) \
{ \
qemu_register_pc_machine(&pc_machine_##suffix); \
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)