From patchwork Tue Feb 16 02:20:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 8320701 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 99948C02AA for ; Tue, 16 Feb 2016 02:45:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E54722028D for ; Tue, 16 Feb 2016 02:45:54 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7B1452025A for ; Tue, 16 Feb 2016 02:45:53 +0000 (UTC) Received: from localhost ([::1]:38527 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aVVeC-0005gl-V7 for patchwork-qemu-devel@patchwork.kernel.org; Mon, 15 Feb 2016 21:45:52 -0500 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 Received: from ozlabs.org ([2401:3900:2:1::2]:47808) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aVVdz-0007aV-CH; Mon, 15 Feb 2016 21:45:39 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 91A74140557; Tue, 16 Feb 2016 13:45:35 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1455590735; bh=HR1rmqpK69YQochUF+0f+jhq8sb4bo31A43L2F4v3dw=; h=From:To:Cc:Subject:Date:From; b=ZmXwBf52J6MCgvV2fu5XOIhbeOmVp62y4N4dBwbMhw1RsJlBBfZXqwUUjZEPyOQng 2bJZHvLMIxUHoaaXBOtG+LmJeg8ofvNOHJzMdcFosQFyl8Jqx3yfgu7psb5jSv6Wx9 9ufsyB6LyP4jycdm6U4AfqAmcKyr1/5ouajjlxNA= From: David Gibson To: agraf@suse.de, aik@ozlabs.ru Date: Tue, 16 Feb 2016 13:20:00 +1100 Message-Id: <1455589200-12221-1-git-send-email-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.5.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2401:3900:2:1::2 Cc: cornelia.huck@de.ibm.com, qemu-ppc@nongnu.org, lersek@redhat.com, qemu-devel@nongnu.org, David Gibson Subject: [Qemu-devel] [PATCH] pseries: Include missing pseries-2.5 compat properties in pseries-2.4 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Reviewed-by: Laszlo Ersek Reviewed-by: Laurent Vivier --- 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)