From patchwork Mon Jan 11 04:37:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 565597 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id D03BB1402D9 for ; Mon, 11 Jan 2016 15:37:38 +1100 (AEDT) Received: from localhost ([::1]:51293 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aIUEa-0000W8-Cw for incoming@patchwork.ozlabs.org; Sun, 10 Jan 2016 23:37:36 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52175) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aIUE0-0007nz-9q for qemu-devel@nongnu.org; Sun, 10 Jan 2016 23:37:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aIUDz-0004Rc-3J for qemu-devel@nongnu.org; Sun, 10 Jan 2016 23:37:00 -0500 Received: from ozlabs.org ([2401:3900:2:1::2]:58918) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aIUDy-0004Qd-Nc; Sun, 10 Jan 2016 23:36:59 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id E23BB1409C3; Mon, 11 Jan 2016 15:36:49 +1100 (AEDT) From: David Gibson To: peter.maydell@linaro.org, mdroth@linux.vnet.ibm.com, aik@ozlabs.ru Date: Mon, 11 Jan 2016 15:37:26 +1100 Message-Id: <1452487058-17182-5-git-send-email-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1452487058-17182-1-git-send-email-david@gibson.dropbear.id.au> References: <1452487058-17182-1-git-send-email-david@gibson.dropbear.id.au> 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: lvivier@redhat.com, thuth@redhat.com, agraf@suse.de, qemu-devel@nongnu.org, qemu-ppc@nongnu.org, David Gibson Subject: [Qemu-devel] [PULL 04/16] pseries: Remove redundant setting of mc->name for pseries-2.5 machine 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 98cec76 "machine: Set MachineClass::name automatically" removed the setting of mc->name for the pseries machine types, since it can be derived automatically from the type names constructed with MACHINE_TYPE_NAME(). Unfortunately fb0fc8f "spapr: Create pseries-2.5 machine" went in later and brought one of them back. This removes it again. Signed-off-by: David Gibson Reviewed-by: Thomas Huth Reviewed-by: Alexey Kardashevskiy --- hw/ppc/spapr.c | 1 - 1 file changed, 1 deletion(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 29a16b7..a69856f 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2440,7 +2440,6 @@ static void spapr_machine_2_5_class_init(ObjectClass *oc, void *data) MachineClass *mc = MACHINE_CLASS(oc); sPAPRMachineClass *smc = SPAPR_MACHINE_CLASS(oc); - mc->name = "pseries-2.5"; mc->desc = "pSeries Logical Partition (PAPR compliant) v2.5"; mc->alias = "pseries"; mc->is_default = 1;