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:41 +0400 |
| commit | abd93cc7df8521d463c24b2106fdde4f40a3fdd5 (patch) | |
| tree | e9f567fcd4a8cfc23a30fef148d4f5c6b3667a7e /include | |
| parent | 638b47412b855867cffd291d16673f01f414882c (diff) | |
compat: replace PC_COMPAT_3_1 & HW_COMPAT_3_1 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 | 11 | ||||
| -rw-r--r-- | include/hw/i386/pc.h | 9 |
3 files changed, 5 insertions, 18 deletions
diff --git a/include/hw/boards.h b/include/hw/boards.h index 0566742412..b9a5c2d087 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -288,4 +288,7 @@ struct MachineState { } \ type_init(machine_initfn##_register_types) +extern GlobalProperty hw_compat_3_1[]; +extern const size_t hw_compat_3_1_len; + #endif diff --git a/include/hw/compat.h b/include/hw/compat.h index 3ca85b037c..6f4d5fc647 100644 --- a/include/hw/compat.h +++ b/include/hw/compat.h @@ -1,17 +1,6 @@ #ifndef HW_COMPAT_H #define HW_COMPAT_H -#define HW_COMPAT_3_1 \ - {\ - .driver = "pcie-root-port",\ - .property = "x-speed",\ - .value = "2_5",\ - },{\ - .driver = "pcie-root-port",\ - .property = "x-width",\ - .value = "1",\ - }, - #define HW_COMPAT_3_0 \ /* empty */ diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index c7c0c944e8..dd1d6fd0f3 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -294,13 +294,8 @@ int e820_add_entry(uint64_t, uint64_t, uint32_t); int e820_get_num_entries(void); bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *); -#define PC_COMPAT_3_1 \ - HW_COMPAT_3_1 \ - {\ - .driver = "intel-iommu",\ - .property = "dma-drain",\ - .value = "off",\ - }, +extern GlobalProperty pc_compat_3_1[]; +extern const size_t pc_compat_3_1_len; #define PC_COMPAT_3_0 \ HW_COMPAT_3_0 \ |