Commit 1c81003a authored by David Gibson's avatar David Gibson
Browse files

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



Commit 4b23699c "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: default avatarLaszlo Ersek <lersek@redhat.com>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Reviewed-by: default avatarLaszlo Ersek <lersek@redhat.com>
Reviewed-by: default avatarLaurent Vivier <lvivier@redhat.com>
parent e4d162d7

hw/ppc/spapr.c

+1 −0
Original line number Diff line number Diff line
@@ -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)