xemu-project/xemu
1
0
Fork 0
mirror of https://github.com/xemu-project/xemu.git synced 2024-11-28 22:10:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

compat: replace PC_COMPAT_3_0 & HW_COMPAT_3_0 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 abd93cc7df
commit ddb3235de1
10 changed files with 32 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/arm/virt.c
View File

@ -1881,12 +1881,8 @@ DEFINE_VIRT_MACHINE(3, 1)
static void virt_machine_3_0_options(MachineClass *mc)
{
static GlobalProperty compat[] = {
HW_COMPAT_3_0
};
virt_machine_3_1_options(mc);
compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
compat_props_add(mc->compat_props, hw_compat_3_0, hw_compat_3_0_len);
}
DEFINE_VIRT_MACHINE(3, 0)

3
hw/core/machine.c
View File

@ -35,6 +35,9 @@ GlobalProperty hw_compat_3_1[] = {
};
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);
static char *machine_get_accel(Object *obj, Error **errp)
{
MachineState *ms = MACHINE(obj);

17
hw/i386/pc.c
View File

@ -118,6 +118,23 @@ GlobalProperty pc_compat_3_1[] = {
};
const size_t pc_compat_3_1_len = G_N_ELEMENTS(pc_compat_3_1);
GlobalProperty pc_compat_3_0[] = {
{
.driver = TYPE_X86_CPU,
.property = "x-hv-synic-kvm-only",
.value = "on",
},{
.driver = "Skylake-Server" "-" TYPE_X86_CPU,
.property = "pku",
.value = "off",
},{
.driver = "Skylake-Server-IBRS" "-" TYPE_X86_CPU,
.property = "pku",
.value = "off",
},
};
const size_t pc_compat_3_0_len = G_N_ELEMENTS(pc_compat_3_0);
void gsi_handler(void *opaque, int n, int level)
{
GSIState *s = opaque;

7
hw/i386/pc_piix.c
View File

@ -452,12 +452,9 @@ DEFINE_I440FX_MACHINE(v3_1, "pc-i440fx-3.1", NULL,
static void pc_i440fx_3_0_machine_options(MachineClass *m)
{
static GlobalProperty compat[] = {
PC_COMPAT_3_0
};
pc_i440fx_3_1_machine_options(m);
compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat));
compat_props_add(m->compat_props, hw_compat_3_0, hw_compat_3_0_len);
compat_props_add(m->compat_props, pc_compat_3_0, pc_compat_3_0_len);
}
DEFINE_I440FX_MACHINE(v3_0, "pc-i440fx-3.0", NULL,

7
hw/i386/pc_q35.c
View File

@ -335,12 +335,9 @@ DEFINE_Q35_MACHINE(v3_1, "pc-q35-3.1", NULL,
static void pc_q35_3_0_machine_options(MachineClass *m)
{
static GlobalProperty compat[] = {
PC_COMPAT_3_0
};
pc_q35_3_1_machine_options(m);
compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat));
compat_props_add(m->compat_props, hw_compat_3_0, hw_compat_3_0_len);
compat_props_add(m->compat_props, pc_compat_3_0, pc_compat_3_0_len);
}
DEFINE_Q35_MACHINE(v3_0, "pc-q35-3.0", NULL,

5
hw/ppc/spapr.c
View File

@ -4037,12 +4037,9 @@ DEFINE_SPAPR_MACHINE(3_1, "3.1", false);
static void spapr_machine_3_0_class_options(MachineClass *mc)
{
sPAPRMachineClass *smc = SPAPR_MACHINE_CLASS(mc);
static GlobalProperty compat[] = {
HW_COMPAT_3_0
};
spapr_machine_3_1_class_options(mc);
compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
compat_props_add(mc->compat_props, hw_compat_3_0, hw_compat_3_0_len);
smc->legacy_irq_allocation = true;
smc->irq = &spapr_irq_xics_legacy;

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

@ -680,13 +680,10 @@ static void ccw_machine_3_0_instance_options(MachineState *machine)
static void ccw_machine_3_0_class_options(MachineClass *mc)
{
S390CcwMachineClass *s390mc = S390_MACHINE_CLASS(mc);
static GlobalProperty compat[] = {
HW_COMPAT_3_0
};
s390mc->hpage_1m_allowed = false;
ccw_machine_3_1_class_options(mc);
compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
compat_props_add(mc->compat_props, hw_compat_3_0, hw_compat_3_0_len);
}
DEFINE_CCW_MACHINE(3_0, "3.0", false);

3
include/hw/boards.h
View File

@ -291,4 +291,7 @@ struct MachineState {
extern GlobalProperty hw_compat_3_1[];
extern const size_t hw_compat_3_1_len;
extern GlobalProperty hw_compat_3_0[];
extern const size_t hw_compat_3_0_len;
#endif

3
include/hw/compat.h
View File

@ -1,9 +1,6 @@
#ifndef HW_COMPAT_H
#define HW_COMPAT_H
#define HW_COMPAT_3_0 \
/* empty */
#define HW_COMPAT_2_12 \
{\
.driver = "migration",\

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

@ -297,21 +297,8 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *);
extern GlobalProperty pc_compat_3_1[];
extern const size_t pc_compat_3_1_len;
#define PC_COMPAT_3_0 \
HW_COMPAT_3_0 \
{\
.driver = TYPE_X86_CPU,\
.property = "x-hv-synic-kvm-only",\
.value = "on",\
},{\
.driver = "Skylake-Server" "-" TYPE_X86_CPU,\
.property = "pku",\
.value = "off",\
},{\
.driver = "Skylake-Server-IBRS" "-" TYPE_X86_CPU,\
.property = "pku",\
.value = "off",\
},
extern GlobalProperty pc_compat_3_0[];
extern const size_t pc_compat_3_0_len;
#define PC_COMPAT_2_12 \
HW_COMPAT_2_12 \