mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

compat: replace PC_COMPAT_2_12 & HW_COMPAT_2_12 macros

Browse Source 
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:
Marc-André Lureau 2018-12-12 19:36:30 +04:00
parent ddb3235de1
commit 0d47310b03
10 changed files with 62 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hw/arm/virt.c
View File

@ -1889,12 +1889,9 @@ DEFINE_VIRT_MACHINE(3, 0)
static void virt_machine_2_12_options(MachineClass *mc)
{
VirtMachineClass *vmc = VIRT_MACHINE_CLASS(OBJECT_CLASS(mc));
static GlobalProperty compat[] = {
HW_COMPAT_2_12
};
virt_machine_3_0_options(mc);
compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
compat_props_add(mc->compat_props, hw_compat_2_12, hw_compat_2_12_len);
vmc->no_highmem_ecam = true;
mc->max_cpus = 255;
}

29
hw/core/machine.c
View File

@ -38,6 +38,35 @@ const size_t hw_compat_3_1_len = G_N_ELEMENTS(hw_compat_3_1);
GlobalProperty hw_compat_3_0[] = {};
const size_t hw_compat_3_0_len = G_N_ELEMENTS(hw_compat_3_0);
GlobalProperty hw_compat_2_12[] = {
{
.driver = "migration",
.property = "decompress-error-check",
.value = "off",
},{
.driver = "hda-audio",
.property = "use-timer",
.value = "false",
},{
.driver = "cirrus-vga",
.property = "global-vmstate",
.value = "true",
},{
.driver = "VGA",
.property = "global-vmstate",
.value = "true",
},{
.driver = "vmware-svga",
.property = "global-vmstate",
.value = "true",
},{
.driver = "qxl-vga",
.property = "global-vmstate",
.value = "true",
},
};
const size_t hw_compat_2_12_len = G_N_ELEMENTS(hw_compat_2_12);
static char *machine_get_accel(Object *obj, Error **errp)
{
MachineState *ms = MACHINE(obj);

21
hw/i386/pc.c
View File

@ -135,6 +135,27 @@ GlobalProperty pc_compat_3_0[] = {
};
const size_t pc_compat_3_0_len = G_N_ELEMENTS(pc_compat_3_0);
GlobalProperty pc_compat_2_12[] = {
{
.driver = TYPE_X86_CPU,
.property = "legacy-cache",
.value = "on",
},{
.driver = TYPE_X86_CPU,
.property = "topoext",
.value = "off",
},{
.driver = "EPYC-" TYPE_X86_CPU,
.property = "xlevel",
.value = stringify(0x8000000a),
},{
.driver = "EPYC-IBPB-" TYPE_X86_CPU,
.property = "xlevel",
.value = stringify(0x8000000a),
},
};
const size_t pc_compat_2_12_len = G_N_ELEMENTS(pc_compat_2_12);
void gsi_handler(void *opaque, int n, int level)
{
GSIState *s = opaque;

7
hw/i386/pc_piix.c
View File

@ -462,12 +462,9 @@ DEFINE_I440FX_MACHINE(v3_0, "pc-i440fx-3.0", NULL,
static void pc_i440fx_2_12_machine_options(MachineClass *m)
{
static GlobalProperty compat[] = {
PC_COMPAT_2_12
};
pc_i440fx_3_0_machine_options(m);
compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat));
compat_props_add(m->compat_props, hw_compat_2_12, hw_compat_2_12_len);
compat_props_add(m->compat_props, pc_compat_2_12, pc_compat_2_12_len);
}
DEFINE_I440FX_MACHINE(v2_12, "pc-i440fx-2.12", NULL,

7
hw/i386/pc_q35.c
View File

@ -345,12 +345,9 @@ DEFINE_Q35_MACHINE(v3_0, "pc-q35-3.0", NULL,
static void pc_q35_2_12_machine_options(MachineClass *m)
{
static GlobalProperty compat[] = {
PC_COMPAT_2_12
};
pc_q35_3_0_machine_options(m);
compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat));
compat_props_add(m->compat_props, hw_compat_2_12, hw_compat_2_12_len);
compat_props_add(m->compat_props, pc_compat_2_12, pc_compat_2_12_len);
}
DEFINE_Q35_MACHINE(v2_12, "pc-q35-2.12", NULL,

2
hw/ppc/spapr.c
View File

@ -4054,7 +4054,6 @@ static void spapr_machine_2_12_class_options(MachineClass *mc)
{
sPAPRMachineClass *smc = SPAPR_MACHINE_CLASS(mc);
static GlobalProperty compat[] = {
HW_COMPAT_2_12
{
.driver = TYPE_POWERPC_CPU,
.property = "pre-3.0-migration",
@ -4068,6 +4067,7 @@ static void spapr_machine_2_12_class_options(MachineClass *mc)
};
spapr_machine_3_0_class_options(mc);
compat_props_add(mc->compat_props, hw_compat_2_12, hw_compat_2_12_len);
compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
/* We depend on kvm_enabled() to choose a default value for the

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

@ -696,12 +696,8 @@ static void ccw_machine_2_12_instance_options(MachineState *machine)
static void ccw_machine_2_12_class_options(MachineClass *mc)
{
static GlobalProperty compat[] = {
HW_COMPAT_2_12
};
ccw_machine_3_0_class_options(mc);
compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
compat_props_add(mc->compat_props, hw_compat_2_12, hw_compat_2_12_len);
}
DEFINE_CCW_MACHINE(2_12, "2.12", false);

3
include/hw/boards.h
View File

@ -294,4 +294,7 @@ extern const size_t hw_compat_3_1_len;
extern GlobalProperty hw_compat_3_0[];
extern const size_t hw_compat_3_0_len;
extern GlobalProperty hw_compat_2_12[];
extern const size_t hw_compat_2_12_len;
#endif

27
include/hw/compat.h
View File

@ -1,33 +1,6 @@
#ifndef HW_COMPAT_H
#define HW_COMPAT_H
#define HW_COMPAT_2_12 \
{\
.driver = "migration",\
.property = "decompress-error-check",\
.value = "off",\
},{\
.driver = "hda-audio",\
.property = "use-timer",\
.value = "false",\
},{\
.driver = "cirrus-vga",\
.property = "global-vmstate",\
.value = "true",\
},{\
.driver = "VGA",\
.property = "global-vmstate",\
.value = "true",\
},{\
.driver = "vmware-svga",\
.property = "global-vmstate",\
.value = "true",\
},{\
.driver = "qxl-vga",\
.property = "global-vmstate",\
.value = "true",\
},
#define HW_COMPAT_2_11 \
{\
.driver = "hpet",\

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

@ -300,25 +300,8 @@ extern const size_t pc_compat_3_1_len;
extern GlobalProperty pc_compat_3_0[];
extern const size_t pc_compat_3_0_len;
#define PC_COMPAT_2_12 \
HW_COMPAT_2_12 \
{\
.driver = TYPE_X86_CPU,\
.property = "legacy-cache",\
.value = "on",\
},{\
.driver = TYPE_X86_CPU,\
.property = "topoext",\
.value = "off",\
},{\
.driver = "EPYC-" TYPE_X86_CPU,\
.property = "xlevel",\
.value = stringify(0x8000000a),\
},{\
.driver = "EPYC-IBPB-" TYPE_X86_CPU,\
.property = "xlevel",\
.value = stringify(0x8000000a),\
},
extern GlobalProperty pc_compat_2_12[];
extern const size_t pc_compat_2_12_len;
#define PC_COMPAT_2_11 \
HW_COMPAT_2_11 \