From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53552) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XNJAz-0002su-6E for qemu-devel@nongnu.org; Fri, 29 Aug 2014 06:13:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XNJAe-0001lO-BL for qemu-devel@nongnu.org; Fri, 29 Aug 2014 06:13:01 -0400 Received: from e23smtp04.au.ibm.com ([202.81.31.146]:43591) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XNJAd-0001i0-Ls for qemu-devel@nongnu.org; Fri, 29 Aug 2014 06:12:40 -0400 Received: from /spool/local by e23smtp04.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 29 Aug 2014 20:12:37 +1000 From: Alexey Kardashevskiy Date: Fri, 29 Aug 2014 20:12:22 +1000 Message-Id: <1409307142-2600-19-git-send-email-aik@ozlabs.ru> In-Reply-To: <1409307142-2600-1-git-send-email-aik@ozlabs.ru> References: <1409307142-2600-1-git-send-email-aik@ozlabs.ru> Subject: [Qemu-devel] [RFC PATCH v3 18/18] spapr: Add pseries-2.2 machine List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Alexey Kardashevskiy , Alex Williamson , qemu-ppc@nongnu.org, Alexander Graf , David Gibson This defines new "pseries" machine version 2.2 and make it a default machine. Since "pseries-2.2" does not have "ddw" compat properties set to off and "pseries" becomes an alias of "presies-2.2" instead of 2.1, this effectively enables DDW on both emulated and VFIO PHBs. 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 663cb75..9dfa96c 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -1681,8 +1681,7 @@ static void spapr_machine_2_1_class_init(ObjectClass *oc, void *data) mc->name = "pseries-2.1"; mc->desc = "pSeries Logical Partition (PAPR compliant) v2.1"; - mc->alias = "pseries"; - mc->is_default = 1; + mc->is_default = 0; mc->compat_props = compat_props; } @@ -1692,10 +1691,26 @@ static const TypeInfo spapr_machine_2_1_info = { .class_init = spapr_machine_2_1_class_init, }; +static void spapr_machine_2_2_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc = MACHINE_CLASS(oc); + 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 = { + .name = TYPE_SPAPR_MACHINE "2.2", + .parent = TYPE_SPAPR_MACHINE, + .class_init = spapr_machine_2_2_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_init(spapr_machine_register_types) -- 2.0.0