From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46777) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YkoNm-0002W8-3n for qemu-devel@nongnu.org; Wed, 22 Apr 2015 02:43:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YkoNj-0002Aw-D5 for qemu-devel@nongnu.org; Wed, 22 Apr 2015 02:43:38 -0400 Received: from e39.co.us.ibm.com ([32.97.110.160]:54085) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YkoNj-00028D-5y for qemu-devel@nongnu.org; Wed, 22 Apr 2015 02:43:35 -0400 Received: from /spool/local by e39.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 22 Apr 2015 00:43:34 -0600 From: Michael Roth Date: Wed, 22 Apr 2015 01:28:15 -0500 Message-Id: <1429684100-13354-12-git-send-email-mdroth@linux.vnet.ibm.com> In-Reply-To: <1429684100-13354-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1429684100-13354-1-git-send-email-mdroth@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH v8 11/16] spapr: add pseries-2.4 machine type List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aik@ozlabs.ru, agraf@suse.de, qemu-ppc@nongnu.org, tyreld@linux.vnet.ibm.com, bharata.rao@gmail.com, nfont@linux.vnet.ibm.com, david@gibson.dropbear.id.au Initially this is identifical to pseries-2.3. Subsequent patches will use it to mask new 2.4 features by default. Signed-off-by: Michael Roth --- 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 c1e7281..6fab4d3 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -1862,7 +1862,7 @@ static void spapr_machine_2_3_class_init(ObjectClass *oc, void *data) mc->name = "pseries-2.3"; mc->desc = "pSeries Logical Partition (PAPR compliant) v2.3"; mc->alias = "pseries"; - mc->is_default = 1; + mc->is_default = 0; } static const TypeInfo spapr_machine_2_3_info = { @@ -1871,12 +1871,29 @@ static const TypeInfo spapr_machine_2_3_info = { .class_init = spapr_machine_2_3_class_init, }; +static void spapr_machine_2_4_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc = MACHINE_CLASS(oc); + + mc->name = "pseries-2.4"; + mc->desc = "pSeries Logical Partition (PAPR compliant) v2.4"; + mc->alias = "pseries"; + mc->is_default = 1; +} + +static const TypeInfo spapr_machine_2_4_info = { + .name = TYPE_SPAPR_MACHINE "2.4", + .parent = TYPE_SPAPR_MACHINE, + .class_init = spapr_machine_2_4_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_register_static(&spapr_machine_2_4_info); } type_init(spapr_machine_register_types) -- 1.9.1