xemu-project/xemu
1
0
Fork 0
mirror of https://github.com/xemu-project/xemu.git synced 2024-11-25 04:30:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

compat: replace PC_COMPAT_2_10 & HW_COMPAT_2_10 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 43df70a9dd
commit 503224f4c8
10 changed files with 42 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/arm/virt.c
View File

@ -1909,12 +1909,8 @@ DEFINE_VIRT_MACHINE(2, 11)
static void virt_machine_2_10_options(MachineClass *mc)
{
static GlobalProperty compat[] = {
HW_COMPAT_2_10
};
virt_machine_2_11_options(mc);
compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
compat_props_add(mc->compat_props, hw_compat_2_10, hw_compat_2_10_len);
/* before 2.11 we never faulted accesses to bad addresses */
mc->ignore_memory_transaction_failures = true;
}

13
hw/core/machine.c
View File

@ -88,6 +88,19 @@ GlobalProperty hw_compat_2_11[] = {
};
const size_t hw_compat_2_11_len = G_N_ELEMENTS(hw_compat_2_11);
GlobalProperty hw_compat_2_10[] = {
{
.driver = "virtio-mouse-device",
.property = "wheel-axis",
.value = "false",
},{
.driver = "virtio-tablet-device",
.property = "wheel-axis",
.value = "false",
},
};
const size_t hw_compat_2_10_len = G_N_ELEMENTS(hw_compat_2_10);
static char *machine_get_accel(Object *obj, Error **errp)
{
MachineState *ms = MACHINE(obj);

17
hw/i386/pc.c
View File

@ -169,6 +169,23 @@ GlobalProperty pc_compat_2_11[] = {
};
const size_t pc_compat_2_11_len = G_N_ELEMENTS(pc_compat_2_11);
GlobalProperty pc_compat_2_10[] = {
{
.driver = TYPE_X86_CPU,
.property = "x-hv-max-vps",
.value = "0x40",
},{
.driver = "i440FX-pcihost",
.property = "x-pci-hole64-fix",
.value = "off",
},{
.driver = "q35-pcihost",
.property = "x-pci-hole64-fix",
.value = "off",
},
};
const size_t pc_compat_2_10_len = G_N_ELEMENTS(pc_compat_2_10);
void gsi_handler(void *opaque, int n, int level)
{
GSIState *s = opaque;

7
hw/i386/pc_piix.c
View File

@ -482,12 +482,9 @@ DEFINE_I440FX_MACHINE(v2_11, "pc-i440fx-2.11", NULL,
static void pc_i440fx_2_10_machine_options(MachineClass *m)
{
static GlobalProperty compat[] = {
PC_COMPAT_2_10
};
pc_i440fx_2_11_machine_options(m);
compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat));
compat_props_add(m->compat_props, hw_compat_2_10, hw_compat_2_10_len);
compat_props_add(m->compat_props, pc_compat_2_10, pc_compat_2_10_len);
m->auto_enable_numa_with_memhp = false;
}

7
hw/i386/pc_q35.c
View File

@ -368,12 +368,9 @@ DEFINE_Q35_MACHINE(v2_11, "pc-q35-2.11", NULL,
static void pc_q35_2_10_machine_options(MachineClass *m)
{
static GlobalProperty compat[] = {
PC_COMPAT_2_10
};
pc_q35_2_11_machine_options(m);
compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat));
compat_props_add(m->compat_props, hw_compat_2_10, hw_compat_2_10_len);
compat_props_add(m->compat_props, pc_compat_2_10, pc_compat_2_10_len);
m->numa_auto_assign_ram = numa_legacy_auto_assign_ram;
m->auto_enable_numa_with_memhp = false;
}

6
hw/ppc/spapr.c
View File

@ -4113,12 +4113,8 @@ DEFINE_SPAPR_MACHINE(2_11, "2.11", false);
static void spapr_machine_2_10_class_options(MachineClass *mc)
{
static GlobalProperty compat[] = {
HW_COMPAT_2_10
};
spapr_machine_2_11_class_options(mc);
compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
compat_props_add(mc->compat_props, hw_compat_2_10, hw_compat_2_10_len);
}
DEFINE_SPAPR_MACHINE(2_10, "2.10", false);

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

@ -733,12 +733,8 @@ static void ccw_machine_2_10_instance_options(MachineState *machine)
static void ccw_machine_2_10_class_options(MachineClass *mc)
{
static GlobalProperty compat[] = {
HW_COMPAT_2_10
};
ccw_machine_2_11_class_options(mc);
compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
compat_props_add(mc->compat_props, hw_compat_2_10, hw_compat_2_10_len);
}
DEFINE_CCW_MACHINE(2_10, "2.10", false);

3
include/hw/boards.h
View File

@ -300,4 +300,7 @@ extern const size_t hw_compat_2_12_len;
extern GlobalProperty hw_compat_2_11[];
extern const size_t hw_compat_2_11_len;
extern GlobalProperty hw_compat_2_10[];
extern const size_t hw_compat_2_10_len;
#endif

11
include/hw/compat.h
View File

@ -1,17 +1,6 @@
#ifndef HW_COMPAT_H
#define HW_COMPAT_H
#define HW_COMPAT_2_10 \
{\
.driver = "virtio-mouse-device",\
.property = "wheel-axis",\
.value = "false",\
},{\
.driver = "virtio-tablet-device",\
.property = "wheel-axis",\
.value = "false",\
},
#define HW_COMPAT_2_9 \
{\
.driver = "pci-bridge",\

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

@ -306,21 +306,8 @@ extern const size_t pc_compat_2_12_len;
extern GlobalProperty pc_compat_2_11[];
extern const size_t pc_compat_2_11_len;
#define PC_COMPAT_2_10 \
HW_COMPAT_2_10 \
{\
.driver = TYPE_X86_CPU,\
.property = "x-hv-max-vps",\
.value = "0x40",\
},{\
.driver = "i440FX-pcihost",\
.property = "x-pci-hole64-fix",\
.value = "off",\
},{\
.driver = "q35-pcihost",\
.property = "x-pci-hole64-fix",\
.value = "off",\
},
extern GlobalProperty pc_compat_2_10[];
extern const size_t pc_compat_2_10_len;
#define PC_COMPAT_2_9 \
HW_COMPAT_2_9 \