ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

compat: replace PC_COMPAT_2_4 & HW_COMPAT_2_4 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:
Marc-André Lureau 2018-12-12 19:36:30 +04:00
parent fe759610d5
commit 2f99b9c273
9 changed files with 112 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
hw/core/machine.c
View File

@ -236,6 +236,35 @@ GlobalProperty hw_compat_2_5[] = {
}; };
const size_t hw_compat_2_5_len = G_N_ELEMENTS(hw_compat_2_5); const size_t hw_compat_2_5_len = G_N_ELEMENTS(hw_compat_2_5);
GlobalProperty hw_compat_2_4[] = {
{
.driver = "virtio-blk-device",
.property = "scsi",
.value = "true",
},{
.driver = "e1000",
.property = "extra_mac_registers",
.value = "off",
},{
.driver = "virtio-pci",
.property = "x-disable-pcie",
.value = "on",
},{
.driver = "virtio-pci",
.property = "migrate-extra",
.value = "off",
},{
.driver = "fw_cfg_mem",
.property = "dma_enabled",
.value = "off",
},{
.driver = "fw_cfg_io",
.property = "dma_enabled",
.value = "off",
}
};
const size_t hw_compat_2_4_len = G_N_ELEMENTS(hw_compat_2_4);
static char *machine_get_accel(Object *obj, Error **errp) static char *machine_get_accel(Object *obj, Error **errp)
{ {
MachineState *ms = MACHINE(obj); MachineState *ms = MACHINE(obj);

71
hw/i386/pc.c
View File

@ -284,6 +284,77 @@ const size_t pc_compat_2_6_len = G_N_ELEMENTS(pc_compat_2_6);
GlobalProperty pc_compat_2_5[] = {}; GlobalProperty pc_compat_2_5[] = {};
const size_t pc_compat_2_5_len = G_N_ELEMENTS(pc_compat_2_5); const size_t pc_compat_2_5_len = G_N_ELEMENTS(pc_compat_2_5);
GlobalProperty pc_compat_2_4[] = {
PC_CPU_MODEL_IDS("2.4.0")
{
.driver = "Haswell-" TYPE_X86_CPU,
.property = "abm",
.value = "off",
},
{
.driver = "Haswell-noTSX-" TYPE_X86_CPU,
.property = "abm",
.value = "off",
},
{
.driver = "Broadwell-" TYPE_X86_CPU,
.property = "abm",
.value = "off",
},
{
.driver = "Broadwell-noTSX-" TYPE_X86_CPU,
.property = "abm",
.value = "off",
},
{
.driver = "host" "-" TYPE_X86_CPU,
.property = "host-cache-info",
.value = "on",
},
{
.driver = TYPE_X86_CPU,
.property = "check",
.value = "off",
},
{
.driver = "qemu64" "-" TYPE_X86_CPU,
.property = "sse4a",
.value = "on",
},
{
.driver = "qemu64" "-" TYPE_X86_CPU,
.property = "abm",
.value = "on",
},
{
.driver = "qemu64" "-" TYPE_X86_CPU,
.property = "popcnt",
.value = "on",
},
{
.driver = "qemu32" "-" TYPE_X86_CPU,
.property = "popcnt",
.value = "on",
},{
.driver = "Opteron_G2" "-" TYPE_X86_CPU,
.property = "rdtscp",
.value = "on",
},{
.driver = "Opteron_G3" "-" TYPE_X86_CPU,
.property = "rdtscp",
.value = "on",
},{
.driver = "Opteron_G4" "-" TYPE_X86_CPU,
.property = "rdtscp",
.value = "on",
},{
.driver = "Opteron_G5" "-" TYPE_X86_CPU,
.property = "rdtscp",
.value = "on",
}
};
const size_t pc_compat_2_4_len = G_N_ELEMENTS(pc_compat_2_4);
void gsi_handler(void *opaque, int n, int level) void gsi_handler(void *opaque, int n, int level)
{ {
GSIState *s = opaque; GSIState *s = opaque;

6
hw/i386/pc_piix.c
View File

@ -553,14 +553,12 @@ DEFINE_I440FX_MACHINE(v2_5, "pc-i440fx-2.5", NULL,
static void pc_i440fx_2_4_machine_options(MachineClass *m) static void pc_i440fx_2_4_machine_options(MachineClass *m)
{ {
PCMachineClass *pcmc = PC_MACHINE_CLASS(m); PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
static GlobalProperty compat[] = {
PC_COMPAT_2_4
};
pc_i440fx_2_5_machine_options(m); pc_i440fx_2_5_machine_options(m);
m->hw_version = "2.4.0"; m->hw_version = "2.4.0";
pcmc->broken_reserved_end = true; pcmc->broken_reserved_end = true;
compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat)); compat_props_add(m->compat_props, hw_compat_2_4, hw_compat_2_4_len);
compat_props_add(m->compat_props, pc_compat_2_4, pc_compat_2_4_len);
} }
DEFINE_I440FX_MACHINE(v2_4, "pc-i440fx-2.4", NULL, DEFINE_I440FX_MACHINE(v2_4, "pc-i440fx-2.4", NULL,

6
hw/i386/pc_q35.c
View File

@ -440,14 +440,12 @@ DEFINE_Q35_MACHINE(v2_5, "pc-q35-2.5", NULL,
static void pc_q35_2_4_machine_options(MachineClass *m) static void pc_q35_2_4_machine_options(MachineClass *m)
{ {
PCMachineClass *pcmc = PC_MACHINE_CLASS(m); PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
static GlobalProperty compat[] = {
PC_COMPAT_2_4
};
pc_q35_2_5_machine_options(m); pc_q35_2_5_machine_options(m);
m->hw_version = "2.4.0"; m->hw_version = "2.4.0";
pcmc->broken_reserved_end = true; pcmc->broken_reserved_end = true;
compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat)); compat_props_add(m->compat_props, hw_compat_2_4, hw_compat_2_4_len);
compat_props_add(m->compat_props, pc_compat_2_4, pc_compat_2_4_len);
} }
DEFINE_Q35_MACHINE(v2_4, "pc-q35-2.4", NULL, DEFINE_Q35_MACHINE(v2_4, "pc-q35-2.4", NULL,

5
hw/ppc/spapr.c
View File

@ -4307,13 +4307,10 @@ DEFINE_SPAPR_MACHINE(2_5, "2.5", false);
static void spapr_machine_2_4_class_options(MachineClass *mc) static void spapr_machine_2_4_class_options(MachineClass *mc)
{ {
sPAPRMachineClass *smc = SPAPR_MACHINE_CLASS(mc); sPAPRMachineClass *smc = SPAPR_MACHINE_CLASS(mc);
static GlobalProperty compat[] = {
HW_COMPAT_2_4
};
spapr_machine_2_5_class_options(mc); spapr_machine_2_5_class_options(mc);
smc->dr_lmb_enabled = false; smc->dr_lmb_enabled = false;
compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat)); compat_props_add(mc->compat_props, hw_compat_2_4, hw_compat_2_4_len);
} }
DEFINE_SPAPR_MACHINE(2_4, "2.4", false); DEFINE_SPAPR_MACHINE(2_4, "2.4", false);

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

@ -849,7 +849,6 @@ static void ccw_machine_2_4_instance_options(MachineState *machine)
static void ccw_machine_2_4_class_options(MachineClass *mc) static void ccw_machine_2_4_class_options(MachineClass *mc)
{ {
static GlobalProperty compat[] = { static GlobalProperty compat[] = {
HW_COMPAT_2_4
{ {
.driver = TYPE_S390_SKEYS, .driver = TYPE_S390_SKEYS,
.property = "migration-enabled", .property = "migration-enabled",
@ -890,6 +889,7 @@ static void ccw_machine_2_4_class_options(MachineClass *mc)
}; };
ccw_machine_2_5_class_options(mc); ccw_machine_2_5_class_options(mc);
compat_props_add(mc->compat_props, hw_compat_2_4, hw_compat_2_4_len);
compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat)); compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
} }
DEFINE_CCW_MACHINE(2_4, "2.4", false); DEFINE_CCW_MACHINE(2_4, "2.4", false);

3
include/hw/boards.h
View File

@ -318,4 +318,7 @@ extern const size_t hw_compat_2_6_len;
extern GlobalProperty hw_compat_2_5[]; extern GlobalProperty hw_compat_2_5[];
extern const size_t hw_compat_2_5_len; extern const size_t hw_compat_2_5_len;
extern GlobalProperty hw_compat_2_4[];
extern const size_t hw_compat_2_4_len;
#endif #endif

27
include/hw/compat.h
View File

@ -1,33 +1,6 @@
#ifndef HW_COMPAT_H #ifndef HW_COMPAT_H
#define HW_COMPAT_H #define HW_COMPAT_H
#define HW_COMPAT_2_4 \
{\
.driver = "virtio-blk-device",\
.property = "scsi",\
.value = "true",\
},{\
.driver = "e1000",\
.property = "extra_mac_registers",\
.value = "off",\
},{\
.driver = "virtio-pci",\
.property = "x-disable-pcie",\
.value = "on",\
},{\
.driver = "virtio-pci",\
.property = "migrate-extra",\
.value = "off",\
},{\
.driver = "fw_cfg_mem",\
.property = "dma_enabled",\
.value = "off",\
},{\
.driver = "fw_cfg_io",\
.property = "dma_enabled",\
.value = "off",\
},
#define HW_COMPAT_2_3 \ #define HW_COMPAT_2_3 \
{\ {\
.driver = "virtio-blk-pci",\ .driver = "virtio-blk-pci",\

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

@ -324,6 +324,9 @@ extern const size_t pc_compat_2_6_len;
extern GlobalProperty pc_compat_2_5[]; extern GlobalProperty pc_compat_2_5[];
extern const size_t pc_compat_2_5_len; extern const size_t pc_compat_2_5_len;
extern GlobalProperty pc_compat_2_4[];
extern const size_t pc_compat_2_4_len;
/* Helper for setting model-id for CPU models that changed model-id /* Helper for setting model-id for CPU models that changed model-id
* depending on QEMU versions up to QEMU 2.4. * depending on QEMU versions up to QEMU 2.4.
*/ */
@ -344,77 +347,6 @@ extern const size_t pc_compat_2_5_len;
.value = "QEMU Virtual CPU version " v,\ .value = "QEMU Virtual CPU version " v,\
}, },
#define PC_COMPAT_2_4 \
HW_COMPAT_2_4 \
PC_CPU_MODEL_IDS("2.4.0") \
{\
.driver = "Haswell-" TYPE_X86_CPU,\
.property = "abm",\
.value = "off",\
},\
{\
.driver = "Haswell-noTSX-" TYPE_X86_CPU,\
.property = "abm",\
.value = "off",\
},\
{\
.driver = "Broadwell-" TYPE_X86_CPU,\
.property = "abm",\
.value = "off",\
},\
{\
.driver = "Broadwell-noTSX-" TYPE_X86_CPU,\
.property = "abm",\
.value = "off",\
},\
{\
.driver = "host" "-" TYPE_X86_CPU,\
.property = "host-cache-info",\
.value = "on",\
},\
{\
.driver = TYPE_X86_CPU,\
.property = "check",\
.value = "off",\
},\
{\
.driver = "qemu64" "-" TYPE_X86_CPU,\
.property = "sse4a",\
.value = "on",\
},\
{\
.driver = "qemu64" "-" TYPE_X86_CPU,\
.property = "abm",\
.value = "on",\
},\
{\
.driver = "qemu64" "-" TYPE_X86_CPU,\
.property = "popcnt",\
.value = "on",\
},\
{\
.driver = "qemu32" "-" TYPE_X86_CPU,\
.property = "popcnt",\
.value = "on",\
},{\
.driver = "Opteron_G2" "-" TYPE_X86_CPU,\
.property = "rdtscp",\
.value = "on",\
},{\
.driver = "Opteron_G3" "-" TYPE_X86_CPU,\
.property = "rdtscp",\
.value = "on",\
},{\
.driver = "Opteron_G4" "-" TYPE_X86_CPU,\
.property = "rdtscp",\
.value = "on",\
},{\
.driver = "Opteron_G5" "-" TYPE_X86_CPU,\
.property = "rdtscp",\
.value = "on",\
},
#define PC_COMPAT_2_3 \ #define PC_COMPAT_2_3 \
HW_COMPAT_2_3 \ HW_COMPAT_2_3 \
PC_CPU_MODEL_IDS("2.3.0") \ PC_CPU_MODEL_IDS("2.3.0") \