From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33651) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YH0nC-0001G8-5w for qemu-devel@nongnu.org; Thu, 29 Jan 2015 20:54:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YH0mv-0007UB-F0 for qemu-devel@nongnu.org; Thu, 29 Jan 2015 20:54:42 -0500 Received: from e23smtp03.au.ibm.com ([202.81.31.145]:46429) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YH0mu-0007SU-Q6 for qemu-devel@nongnu.org; Thu, 29 Jan 2015 20:54:25 -0500 Received: from /spool/local by e23smtp03.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 30 Jan 2015 11:54:21 +1000 From: Alexey Kardashevskiy Date: Fri, 30 Jan 2015 12:53:18 +1100 Message-Id: <1422582799-29384-2-git-send-email-aik@ozlabs.ru> In-Reply-To: <1422582799-29384-1-git-send-email-aik@ozlabs.ru> References: <1422582799-29384-1-git-send-email-aik@ozlabs.ru> Subject: [Qemu-devel] [PATCH v4 1/2] spapr: Add pseries-2.3 machine List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Alexey Kardashevskiy , qemu-ppc@nongnu.org, Alexander Graf , David Gibson The next patch will make MMIO space bigger and keep the old value for older pseries machines. Signed-off-by: Alexey Kardashevskiy --- hw/ppc/spapr.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index b560459..65433fd 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -1780,8 +1780,6 @@ static void spapr_machine_2_2_class_init(ObjectClass *oc, void *data) mc->name = "pseries-2.2"; mc->desc = "pSeries Logical Partition (PAPR compliant) v2.2"; - mc->alias = "pseries"; - mc->is_default = 1; } static const TypeInfo spapr_machine_2_2_info = { @@ -1790,11 +1788,28 @@ static const TypeInfo spapr_machine_2_2_info = { .class_init = spapr_machine_2_2_class_init, }; +static void spapr_machine_2_3_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc = MACHINE_CLASS(oc); + + mc->name = "pseries-2.3"; + mc->desc = "pSeries Logical Partition (PAPR compliant) v2.3"; + mc->alias = "pseries"; + mc->is_default = 1; +} + +static const TypeInfo spapr_machine_2_3_info = { + .name = TYPE_SPAPR_MACHINE "2.3", + .parent = TYPE_SPAPR_MACHINE, + .class_init = spapr_machine_2_3_class_init, +}; + static void spapr_machine_register_types(void) { type_register_static(&spapr_machine_info); type_register_static(&spapr_machine_2_1_info); type_register_static(&spapr_machine_2_2_info); + type_register_static(&spapr_machine_2_3_info); } type_init(spapr_machine_register_types) -- 2.0.0