From: David Gibson <david@gibson.dropbear.id.au>
Date: Tue, 16 Feb 2016 23:25:37 +0000 (+1100)
Subject: pseries: Include missing pseries-2.5 compat properties in pseries-2.4
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=1c81003accd70e79f1663ad4429435b4d3300d62;p=qemu.git

pseries: Include missing pseries-2.5 compat properties in pseries-2.4

Commit 4b23699 "pseries: Add pseries-2.6 machine type" added a new
SPAPR_COMPAT_2_5 macro in the usual way.  However, it didn't add this
macro to the existing SPAPR_COMPAT_2_4 macro so that pseries-2.4
inherits newer compatibility properties which are needed for 2.5 and
earlier.

This corrects the oversight.

Reported-by: Laszlo Ersek <lersek@redhat.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Laurent Vivier <lvivier@redhat.com>
---

diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 276d6b4ceb..e214a34257 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -2391,6 +2391,7 @@ DEFINE_SPAPR_MACHINE(2_5, "2.5", false);
  * pseries-2.4
  */
 #define SPAPR_COMPAT_2_4 \
+        SPAPR_COMPAT_2_5 \
         HW_COMPAT_2_4
 
 static void spapr_machine_2_4_instance_options(MachineState *machine)