diff options
| author | Marc-André Lureau | 2018-12-12 16:36:30 +0100 |
|---|---|---|
| committer | Marc-André Lureau | 2019-01-07 13:18:41 +0100 |
| commit | 0d47310b031e62883faf38a6fda6e262a2f00d7a (patch) | |
| tree | 5b9157518a540e3088eca1b433dc26c43e3520f5 /include | |
| parent | compat: replace PC_COMPAT_3_0 & HW_COMPAT_3_0 macros (diff) | |
| download | qemu-0d47310b031e62883faf38a6fda6e262a2f00d7a.tar.gz qemu-0d47310b031e62883faf38a6fda6e262a2f00d7a.tar.xz qemu-0d47310b031e62883faf38a6fda6e262a2f00d7a.zip | |
compat: replace PC_COMPAT_2_12 & HW_COMPAT_2_12 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 'include')
| -rw-r--r-- | include/hw/boards.h | 3 | ||||
| -rw-r--r-- | include/hw/compat.h | 27 | ||||
| -rw-r--r-- | include/hw/i386/pc.h | 21 |
3 files changed, 5 insertions, 46 deletions
diff --git a/include/hw/boards.h b/include/hw/boards.h index aaa57f1f6b..c6d828e73c 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -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 diff --git a/include/hw/compat.h b/include/hw/compat.h index c08f4040bb..13242b831a 100644 --- a/include/hw/compat.h +++ b/include/hw/compat.h @@ -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",\ diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 197131ff9a..91cb3283f0 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -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 \ |