From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41106) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a6VZC-0001B4-3L for qemu-devel@nongnu.org; Tue, 08 Dec 2015 22:37:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a6VZA-000660-Fo for qemu-devel@nongnu.org; Tue, 08 Dec 2015 22:37:22 -0500 Received: from mail-pf0-x229.google.com ([2607:f8b0:400e:c00::229]:33840) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a6VZA-00065p-BZ for qemu-devel@nongnu.org; Tue, 08 Dec 2015 22:37:20 -0500 Received: by pfbg73 with SMTP id g73so23096241pfb.1 for ; Tue, 08 Dec 2015 19:37:19 -0800 (PST) References: <1449459280-14983-1-git-send-email-david@gibson.dropbear.id.au> <1449459280-14983-11-git-send-email-david@gibson.dropbear.id.au> From: Alexey Kardashevskiy Message-ID: <5667A1E9.9060704@ozlabs.ru> Date: Wed, 9 Dec 2015 14:37:13 +1100 MIME-Version: 1.0 In-Reply-To: <1449459280-14983-11-git-send-email-david@gibson.dropbear.id.au> Content-Type: text/plain; charset=koi8-r; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCHv2 10/10] pseries: Add pseries-2.6 machine type List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: David Gibson , ehabkost@redhat.com, agraf@suse.de, mdroth@linux.vnet.ibm.com Cc: lvivier@redhat.com, thuth@redhat.com, qemu-ppc@nongnu.org, qemu-devel@nongnu.org On 12/07/2015 02:34 PM, David Gibson wrote: > Signed-off-by: David Gibson > --- > hw/ppc/spapr.c | 18 ++++++++++++++++-- > 1 file changed, 16 insertions(+), 2 deletions(-) > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 8b8eb18..2d57ab0 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -2337,6 +2337,20 @@ static const TypeInfo spapr_machine_info = { > machine_init(spapr_machine_register_##suffix) > > /* > + * pseries-2.6 > + */ > +static void spapr_machine_2_6_instance_options(MachineState *machine) > +{ > +} > + > +static void spapr_machine_2_6_class_options(MachineClass *mc) > +{ > + /* Defaults for the latest behaviour inherited from the base class */ > +} > + > +DEFINE_SPAPR_MACHINE(2_6, "2.6", true); > + > +/* > * pseries-2.5 > */ > static void spapr_machine_2_5_instance_options(MachineState *machine) > @@ -2345,10 +2359,10 @@ static void spapr_machine_2_5_instance_options(MachineState *machine) > > static void spapr_machine_2_5_class_options(MachineClass *mc) > { > - /* Defaults for the latest behaviour inherited from the base class */ > + spapr_machine_2_6_class_options(mc); > } > > -DEFINE_SPAPR_MACHINE(2_5, "2.5", true); > +DEFINE_SPAPR_MACHINE(2_5, "2.5", false); > > /* > * pseries-2.4 > Reviewed-by: Alexey Kardashevskiy -- Alexey