From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40921) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZXM86-0003UP-Ap for qemu-devel@nongnu.org; Thu, 03 Sep 2015 00:28:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZXM84-0002Xg-G2 for qemu-devel@nongnu.org; Thu, 03 Sep 2015 00:28:06 -0400 From: David Gibson Date: Thu, 3 Sep 2015 14:27:53 +1000 Message-Id: <1441254496-16174-3-git-send-email-david@gibson.dropbear.id.au> In-Reply-To: <1441254496-16174-1-git-send-email-david@gibson.dropbear.id.au> References: <1441254496-16174-1-git-send-email-david@gibson.dropbear.id.au> Subject: [Qemu-devel] [PATCH 02/25] spapr: Create pseries-2.5 machine List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: peter.maydell@linaro.org Cc: mdroth@linux.vnet.ibm.com, aik@ozlabs.ru, qemu-devel@nongnu.org, agraf@suse.de, qemu-ppc@nongnu.org, Bharata B Rao , David Gibson Add pseries-2.5 machine version. Signed-off-by: Bharata B Rao [Altered to merge before memory hotplug -- dwg] Signed-off-by: David Gibson --- hw/ppc/spapr.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index d6f1c84..c03f89c 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -1980,7 +1980,7 @@ static void spapr_machine_2_4_class_init(ObjectClass *oc, void *data) mc->name = "pseries-2.4"; mc->desc = "pSeries Logical Partition (PAPR compliant) v2.4"; mc->alias = "pseries"; - mc->is_default = 1; + mc->is_default = 0; } static const TypeInfo spapr_machine_2_4_info = { @@ -1989,6 +1989,22 @@ static const TypeInfo spapr_machine_2_4_info = { .class_init = spapr_machine_2_4_class_init, }; +static void spapr_machine_2_5_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc = MACHINE_CLASS(oc); + + mc->name = "pseries-2.5"; + mc->desc = "pSeries Logical Partition (PAPR compliant) v2.5"; + mc->alias = "pseries"; + mc->is_default = 1; +} + +static const TypeInfo spapr_machine_2_5_info = { + .name = TYPE_SPAPR_MACHINE "2.5", + .parent = TYPE_SPAPR_MACHINE, + .class_init = spapr_machine_2_5_class_init, +}; + static void spapr_machine_register_types(void) { type_register_static(&spapr_machine_info); @@ -1996,6 +2012,7 @@ static void spapr_machine_register_types(void) type_register_static(&spapr_machine_2_2_info); type_register_static(&spapr_machine_2_3_info); type_register_static(&spapr_machine_2_4_info); + type_register_static(&spapr_machine_2_5_info); } type_init(spapr_machine_register_types) -- 2.4.3