[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 07/13] spapr: Use HW_COMPAT_* inside SPAPR_COMPAT_*
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PATCH 07/13] spapr: Use HW_COMPAT_* inside SPAPR_COMPAT_* macros |
Date: |
Mon, 11 May 2015 17:55:50 -0300 |
SPAPR_COMPAT_2_1 will need to include both HW_COMPAT_2_2 and
HW_COMPAT_2_1, so include HW_COMPAT_2_1 inside SPAPR_COMPAT_2_1 and
HW_COMPAT_2_2 inside SPAPR_COMPAT_2_2.
Signed-off-by: Eduardo Habkost <address@hidden>
---
hw/ppc/spapr.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index baad70e..84d1d81 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -1816,6 +1816,7 @@ static const TypeInfo spapr_machine_info = {
};
#define SPAPR_COMPAT_2_2 \
+ HW_COMPAT_2_2 \
{\
.driver = TYPE_SPAPR_PCI_HOST_BRIDGE,\
.property = "mem_win_size",\
@@ -1823,13 +1824,13 @@ static const TypeInfo spapr_machine_info = {
},
#define SPAPR_COMPAT_2_1 \
- SPAPR_COMPAT_2_2
+ SPAPR_COMPAT_2_2 \
+ HW_COMPAT_2_1
static void spapr_machine_2_1_class_init(ObjectClass *oc, void *data)
{
MachineClass *mc = MACHINE_CLASS(oc);
static GlobalProperty compat_props[] = {
- HW_COMPAT_2_1
SPAPR_COMPAT_2_1
{ /* end of list */ }
};
--
2.1.0
- [Qemu-devel] [PATCH 00/13] pc, hw, spapr: Cleanup of {HW, PC, SPAPR}_COMPAT_* macros, Eduardo Habkost, 2015/05/11
- [Qemu-devel] [PATCH 01/13] pc: Replace tab with spaces, Eduardo Habkost, 2015/05/11
- [Qemu-devel] [PATCH 02/13] hw: Move commas inside HW_COMPAT_2_1 macro, Eduardo Habkost, 2015/05/11
- [Qemu-devel] [PATCH 03/13] pc: Move commas inside PC_COMPAT_* macros, Eduardo Habkost, 2015/05/11
- [Qemu-devel] [PATCH 04/13] spapr: Move commas inside SPAPR_COMPAT_* macros, Eduardo Habkost, 2015/05/11
- [Qemu-devel] [PATCH 06/13] pc: Define PC_COMPAT_2_[123] macros, Eduardo Habkost, 2015/05/11
- [Qemu-devel] [PATCH 05/13] hw: Define empty HW_COMPAT_2_[23] macros, Eduardo Habkost, 2015/05/11
- [Qemu-devel] [PATCH 07/13] spapr: Use HW_COMPAT_* inside SPAPR_COMPAT_* macros,
Eduardo Habkost <=
- [Qemu-devel] [PATCH 09/13] piix: Move pc-0.14 qxl compat properties to PC_COMPAT_0_14, Eduardo Habkost, 2015/05/11
- [Qemu-devel] [PATCH 08/13] spapr: define SPAPR_COMPAT_2_3, Eduardo Habkost, 2015/05/11
- [Qemu-devel] [PATCH 10/13] piix: Move pc-0.11 drive version compat props to PC_COMPAT_0_11, Eduardo Habkost, 2015/05/11
- [Qemu-devel] [PATCH 13/13] pc_piix: Define PC_COMPAT_0_10, Eduardo Habkost, 2015/05/11
- [Qemu-devel] [PATCH 12/13] piix: Move pc-0.1[23] rombar compat props to PC_COMPAT_0_13, Eduardo Habkost, 2015/05/11
- [Qemu-devel] [PATCH 11/13] piix: Move pc-0.13 virtio-9p-pci compat to PC_COMPAT_0_13, Eduardo Habkost, 2015/05/11