[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 10/60] spapr: Use HW_COMPAT_* inside SPAPR_COMPAT_
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL v2 10/60] spapr: Use HW_COMPAT_* inside SPAPR_COMPAT_* macros |
Date: |
Mon, 1 Jun 2015 14:22:55 +0200 |
From: Eduardo Habkost <address@hidden>
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>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <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 ee0ec61..de1b740 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,7 +1824,8 @@ 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_compat_2_3(Object *obj)
{
@@ -1861,7 +1863,6 @@ 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 */ }
};
--
MST
- [Qemu-devel] [PULL v2 00/60] pc, pci, tpm, virtio, vhost enhancements and fixes, Michael S. Tsirkin, 2015/06/01
- [Qemu-devel] [PULL v2 01/60] hw/virtio/virtio-balloon: move adding property to virtio_balloon_instance_init, Michael S. Tsirkin, 2015/06/01
- [Qemu-devel] [PULL v2 02/60] hw/virtio/virtio-pci: use alias property for virtio-balloon-pci, Michael S. Tsirkin, 2015/06/01
- [Qemu-devel] [PULL v2 03/60] hw/s390x/virtio-ccw: use alias property for virtio-balloon-ccw, Michael S. Tsirkin, 2015/06/01
- [Qemu-devel] [PULL v2 04/60] pc: Replace tab with spaces, Michael S. Tsirkin, 2015/06/01
- [Qemu-devel] [PULL v2 05/60] hw: Move commas inside HW_COMPAT_2_1 macro, Michael S. Tsirkin, 2015/06/01
- [Qemu-devel] [PULL v2 06/60] pc: Move commas inside PC_COMPAT_* macros, Michael S. Tsirkin, 2015/06/01
- [Qemu-devel] [PULL v2 07/60] spapr: Move commas inside SPAPR_COMPAT_* macros, Michael S. Tsirkin, 2015/06/01
- [Qemu-devel] [PULL v2 08/60] hw: Define empty HW_COMPAT_2_[23] macros, Michael S. Tsirkin, 2015/06/01
- [Qemu-devel] [PULL v2 09/60] pc: Define PC_COMPAT_2_[123] macros, Michael S. Tsirkin, 2015/06/01
- [Qemu-devel] [PULL v2 10/60] spapr: Use HW_COMPAT_* inside SPAPR_COMPAT_* macros,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL v2 11/60] spapr: define SPAPR_COMPAT_2_3, Michael S. Tsirkin, 2015/06/01
- [Qemu-devel] [PULL v2 13/60] piix: Move pc-0.11 drive version compat props to PC_COMPAT_0_11, Michael S. Tsirkin, 2015/06/01
- [Qemu-devel] [PULL v2 12/60] piix: Move pc-0.14 qxl compat properties to PC_COMPAT_0_14, Michael S. Tsirkin, 2015/06/01
- [Qemu-devel] [PULL v2 14/60] piix: Move pc-0.13 virtio-9p-pci compat to PC_COMPAT_0_13, Michael S. Tsirkin, 2015/06/01
- [Qemu-devel] [PULL v2 16/60] piix: Define PC_COMPAT_0_10, Michael S. Tsirkin, 2015/06/01
- [Qemu-devel] [PULL v2 15/60] piix: Move pc-0.1[23] rombar compat props to PC_COMPAT_0_13, Michael S. Tsirkin, 2015/06/01
- [Qemu-devel] [PULL v2 17/60] pc: Define MACHINE_OPTIONS macros consistently for all machines, Michael S. Tsirkin, 2015/06/01
- [Qemu-devel] [PULL v2 18/60] pc: Define machines using a DEFINE_PC_MACHINE macro, Michael S. Tsirkin, 2015/06/01
- [Qemu-devel] [PULL v2 19/60] pc: Convert *_MACHINE_OPTIONS macros into functions, Michael S. Tsirkin, 2015/06/01
- [Qemu-devel] [PULL v2 20/60] pc: Move compat_props setting inside *_machine_options() functions, Michael S. Tsirkin, 2015/06/01