From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45747) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aVVe0-0005gT-UU for qemu-devel@nongnu.org; Mon, 15 Feb 2016 21:45:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aVVdz-0007ax-Tt for qemu-devel@nongnu.org; Mon, 15 Feb 2016 21:45:40 -0500 From: David Gibson Date: Tue, 16 Feb 2016 13:20:00 +1100 Message-Id: <1455589200-12221-1-git-send-email-david@gibson.dropbear.id.au> Subject: [Qemu-devel] [PATCH] pseries: Include missing pseries-2.5 compat properties in pseries-2.4 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: agraf@suse.de, aik@ozlabs.ru Cc: cornelia.huck@de.ibm.com, qemu-ppc@nongnu.org, lersek@redhat.com, qemu-devel@nongnu.org, David Gibson 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 Signed-off-by: David Gibson --- hw/ppc/spapr.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 276d6b4..e214a34 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) -- 2.5.0