mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-09 18:44:58 -06:00
compat: replace PC_COMPAT_2_8 & HW_COMPAT_2_8 macros
Use static arrays instead. Suggested-by: Eduardo Habkost <ehabkost@redhat.com> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Reviewed-by: Igor Mammedov <imammedo@redhat.com> Reviewed-by: Cornelia Huck <cohuck@redhat.com> Acked-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
parent
3e8031525a
commit
edc24ccda4
10 changed files with 87 additions and 86 deletions
29
hw/i386/pc.c
29
hw/i386/pc.c
|
@ -195,6 +195,35 @@ GlobalProperty pc_compat_2_9[] = {
|
|||
};
|
||||
const size_t pc_compat_2_9_len = G_N_ELEMENTS(pc_compat_2_9);
|
||||
|
||||
GlobalProperty pc_compat_2_8[] = {
|
||||
{
|
||||
.driver = TYPE_X86_CPU,
|
||||
.property = "tcg-cpuid",
|
||||
.value = "off",
|
||||
},
|
||||
{
|
||||
.driver = "kvmclock",
|
||||
.property = "x-mach-use-reliable-get-clock",
|
||||
.value = "off",
|
||||
},
|
||||
{
|
||||
.driver = "ICH9-LPC",
|
||||
.property = "x-smi-broadcast",
|
||||
.value = "off",
|
||||
},
|
||||
{
|
||||
.driver = TYPE_X86_CPU,
|
||||
.property = "vmware-cpuid-freq",
|
||||
.value = "off",
|
||||
},
|
||||
{
|
||||
.driver = "Haswell-" TYPE_X86_CPU,
|
||||
.property = "stepping",
|
||||
.value = "1",
|
||||
},
|
||||
};
|
||||
const size_t pc_compat_2_8_len = G_N_ELEMENTS(pc_compat_2_8);
|
||||
|
||||
void gsi_handler(void *opaque, int n, int level)
|
||||
{
|
||||
GSIState *s = opaque;
|
||||
|
|
|
@ -504,12 +504,9 @@ DEFINE_I440FX_MACHINE(v2_9, "pc-i440fx-2.9", NULL,
|
|||
|
||||
static void pc_i440fx_2_8_machine_options(MachineClass *m)
|
||||
{
|
||||
static GlobalProperty compat[] = {
|
||||
PC_COMPAT_2_8
|
||||
};
|
||||
|
||||
pc_i440fx_2_9_machine_options(m);
|
||||
compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat));
|
||||
compat_props_add(m->compat_props, hw_compat_2_8, hw_compat_2_8_len);
|
||||
compat_props_add(m->compat_props, pc_compat_2_8, pc_compat_2_8_len);
|
||||
}
|
||||
|
||||
DEFINE_I440FX_MACHINE(v2_8, "pc-i440fx-2.8", NULL,
|
||||
|
|
|
@ -390,12 +390,9 @@ DEFINE_Q35_MACHINE(v2_9, "pc-q35-2.9", NULL,
|
|||
|
||||
static void pc_q35_2_8_machine_options(MachineClass *m)
|
||||
{
|
||||
static GlobalProperty compat[] = {
|
||||
PC_COMPAT_2_8
|
||||
};
|
||||
|
||||
pc_q35_2_9_machine_options(m);
|
||||
compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat));
|
||||
compat_props_add(m->compat_props, hw_compat_2_8, hw_compat_2_8_len);
|
||||
compat_props_add(m->compat_props, pc_compat_2_8, pc_compat_2_8_len);
|
||||
}
|
||||
|
||||
DEFINE_Q35_MACHINE(v2_8, "pc-q35-2.8", NULL,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue