From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43812) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y3OcT-0002Bk-1Z for qemu-devel@nongnu.org; Tue, 23 Dec 2014 07:31:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y3OcJ-00053C-PY for qemu-devel@nongnu.org; Tue, 23 Dec 2014 07:31:20 -0500 Received: from e33.co.us.ibm.com ([32.97.110.151]:53003) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y3OcJ-00052s-IN for qemu-devel@nongnu.org; Tue, 23 Dec 2014 07:31:11 -0500 Received: from /spool/local by e33.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 23 Dec 2014 05:31:11 -0700 From: Michael Roth Date: Tue, 23 Dec 2014 06:30:25 -0600 Message-Id: <1419337831-16552-12-git-send-email-mdroth@linux.vnet.ibm.com> In-Reply-To: <1419337831-16552-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1419337831-16552-1-git-send-email-mdroth@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH v4 11/17] spapr: introduce pseries-2.3 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, ncmike@ncultra.org, qemu-ppc@nongnu.org, tyreld@linux.vnet.ibm.com, bharata.rao@gmail.com, nfont@linux.vnet.ibm.com And make it the default. This is identical to pseries-2.2 for now, but subsequent commits will use it to enable pseries-2.3+ features. Signed-off-by: Michael Roth --- 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 a611616..9eb0a94 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -1777,8 +1777,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 = { @@ -1787,11 +1785,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) -- 1.9.1