diff options
author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2018-12-12 19:36:30 +0400 |
---|---|---|
committer | Marc-André Lureau <marcandre.lureau@redhat.com> | 2019-01-07 16:18:42 +0400 |
commit | edc24ccda4bb4357304bad7910a5039d2dac8daf (patch) | |
tree | 2b8124bc0ce1fbb48127db99b89578cf2322f15d /hw | |
parent | 3e8031525a7431bef796692cc626b2a69a697018 (diff) | |
download | qemu-edc24ccda4bb4357304bad7910a5039d2dac8daf.zip qemu-edc24ccda4bb4357304bad7910a5039d2dac8daf.tar.gz qemu-edc24ccda4bb4357304bad7910a5039d2dac8daf.tar.bz2 |
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>
Diffstat (limited to 'hw')
-rw-r--r-- | hw/arm/virt.c | 5 | ||||
-rw-r--r-- | hw/core/machine.c | 46 | ||||
-rw-r--r-- | hw/i386/pc.c | 29 | ||||
-rw-r--r-- | hw/i386/pc_piix.c | 7 | ||||
-rw-r--r-- | hw/i386/pc_q35.c | 7 | ||||
-rw-r--r-- | hw/ppc/spapr.c | 2 | ||||
-rw-r--r-- | hw/s390x/s390-virtio-ccw.c | 2 |
7 files changed, 82 insertions, 16 deletions
diff --git a/hw/arm/virt.c b/hw/arm/virt.c index a0898f2..d4dee3e 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1926,12 +1926,9 @@ DEFINE_VIRT_MACHINE(2, 9) static void virt_machine_2_8_options(MachineClass *mc) { VirtMachineClass *vmc = VIRT_MACHINE_CLASS(OBJECT_CLASS(mc)); - static GlobalProperty compat[] = { - HW_COMPAT_2_8 - }; virt_machine_2_9_options(mc); - compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat)); + compat_props_add(mc->compat_props, hw_compat_2_8, hw_compat_2_8_len); /* For 2.8 and earlier we falsely claimed in the DT that * our timers were edge-triggered, not level-triggered. */ diff --git a/hw/core/machine.c b/hw/core/machine.c index aa5f03f..efda98a 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -21,6 +21,7 @@ #include "sysemu/numa.h" #include "qemu/error-report.h" #include "sysemu/qtest.h" +#include "hw/pci/pci.h" GlobalProperty hw_compat_3_1[] = { { @@ -122,6 +123,51 @@ GlobalProperty hw_compat_2_9[] = { }; const size_t hw_compat_2_9_len = G_N_ELEMENTS(hw_compat_2_9); +GlobalProperty hw_compat_2_8[] = { + { + .driver = "fw_cfg_mem", + .property = "x-file-slots", + .value = stringify(0x10), + },{ + .driver = "fw_cfg_io", + .property = "x-file-slots", + .value = stringify(0x10), + },{ + .driver = "pflash_cfi01", + .property = "old-multiple-chip-handling", + .value = "on", + },{ + .driver = "pci-bridge", + .property = "shpc", + .value = "on", + },{ + .driver = TYPE_PCI_DEVICE, + .property = "x-pcie-extcap-init", + .value = "off", + },{ + .driver = "virtio-pci", + .property = "x-pcie-deverr-init", + .value = "off", + },{ + .driver = "virtio-pci", + .property = "x-pcie-lnkctl-init", + .value = "off", + },{ + .driver = "virtio-pci", + .property = "x-pcie-pm-init", + .value = "off", + },{ + .driver = "cirrus-vga", + .property = "vgamem_mb", + .value = "8", + },{ + .driver = "isa-cirrus-vga", + .property = "vgamem_mb", + .value = "8", + }, +}; +const size_t hw_compat_2_8_len = G_N_ELEMENTS(hw_compat_2_8); + static char *machine_get_accel(Object *obj, Error **errp) { MachineState *ms = MACHINE(obj); diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 3f6f5df..b094e5b 100644 --- a/hw/i386/pc.c +++ b/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; diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 02520bc..b1fa038 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -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, diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index e94d2d0..7e608b3 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -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, diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 477ff5e..a193538 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -4151,7 +4151,6 @@ DEFINE_SPAPR_MACHINE(2_9, "2.9", false); static void spapr_machine_2_8_class_options(MachineClass *mc) { static GlobalProperty compat[] = { - HW_COMPAT_2_8 { .driver = TYPE_SPAPR_PCI_HOST_BRIDGE, .property = "pcie-extended-configuration-space", @@ -4160,6 +4159,7 @@ static void spapr_machine_2_8_class_options(MachineClass *mc) }; spapr_machine_2_9_class_options(mc); + compat_props_add(mc->compat_props, hw_compat_2_8, hw_compat_2_8_len); compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat)); mc->numa_mem_align_shift = 23; } diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 549f6e0..22e96ab 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -774,7 +774,6 @@ static void ccw_machine_2_8_instance_options(MachineState *machine) static void ccw_machine_2_8_class_options(MachineClass *mc) { static GlobalProperty compat[] = { - HW_COMPAT_2_8 { .driver = TYPE_S390_FLIC_COMMON, .property = "adapter_routes_max_batch", @@ -783,6 +782,7 @@ static void ccw_machine_2_8_class_options(MachineClass *mc) }; ccw_machine_2_9_class_options(mc); + compat_props_add(mc->compat_props, hw_compat_2_8, hw_compat_2_8_len); compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat)); } DEFINE_CCW_MACHINE(2_8, "2.8", false); |