From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44317) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a5si7-0000Xb-KA for qemu-devel@nongnu.org; Mon, 07 Dec 2015 05:08:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a5si3-0004x0-10 for qemu-devel@nongnu.org; Mon, 07 Dec 2015 05:07:59 -0500 References: <1449459280-14983-1-git-send-email-david@gibson.dropbear.id.au> <1449459280-14983-5-git-send-email-david@gibson.dropbear.id.au> From: Thomas Huth Message-ID: <56655A75.3070409@redhat.com> Date: Mon, 7 Dec 2015 11:07:49 +0100 MIME-Version: 1.0 In-Reply-To: <1449459280-14983-5-git-send-email-david@gibson.dropbear.id.au> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCHv2 04/10] pseries: Remove versions from mc->desc List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: David Gibson , ehabkost@redhat.com, agraf@suse.de, aik@ozlabs.ru, mdroth@linux.vnet.ibm.com Cc: lvivier@redhat.com, qemu-ppc@nongnu.org, qemu-devel@nongnu.org On 07/12/15 04:34, David Gibson wrote: > Currently, the versioned spapr machine types put the machine type version > into the description string. PC does not do this, using just the name > itself to distinguish. Doing the same lets us move setting the description > into the common base class, simplifying the code slightly. > > Signed-off-by: David Gibson > --- > hw/ppc/spapr.c | 6 +----- > 1 file changed, 1 insertion(+), 5 deletions(-) > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index c7c6517..b08d338 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -2265,6 +2265,7 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data) > NMIClass *nc = NMI_CLASS(oc); > HotplugHandlerClass *hc = HOTPLUG_HANDLER_CLASS(oc); > > + mc->desc = "pSeries Logical Partition (PAPR compliant)"; > mc->init = ppc_spapr_init; > mc->reset = ppc_spapr_reset; > mc->block_default_type = IF_SCSI; > @@ -2309,7 +2310,6 @@ static void spapr_machine_2_5_class_init(ObjectClass *oc, void *data) > MachineClass *mc = MACHINE_CLASS(oc); > sPAPRMachineClass *smc = SPAPR_MACHINE_CLASS(oc); > > - mc->desc = "pSeries Logical Partition (PAPR compliant) v2.5"; > mc->alias = "pseries"; > mc->is_default = 1; > smc->dr_lmb_enabled = true; > @@ -2335,7 +2335,6 @@ static void spapr_machine_2_4_class_init(ObjectClass *oc, void *data) > }; > MachineClass *mc = MACHINE_CLASS(oc); > > - mc->desc = "pSeries Logical Partition (PAPR compliant) v2.4"; > mc->compat_props = compat_props; > } > > @@ -2376,7 +2375,6 @@ static void spapr_machine_2_3_class_init(ObjectClass *oc, void *data) > }; > MachineClass *mc = MACHINE_CLASS(oc); > > - mc->desc = "pSeries Logical Partition (PAPR compliant) v2.3"; > mc->compat_props = compat_props; > } > > @@ -2418,7 +2416,6 @@ static void spapr_machine_2_2_class_init(ObjectClass *oc, void *data) > }; > MachineClass *mc = MACHINE_CLASS(oc); > > - mc->desc = "pSeries Logical Partition (PAPR compliant) v2.2"; > mc->compat_props = compat_props; > } > > @@ -2454,7 +2451,6 @@ static void spapr_machine_2_1_class_init(ObjectClass *oc, void *data) > { /* end of list */ } > }; > > - mc->desc = "pSeries Logical Partition (PAPR compliant) v2.1"; > mc->compat_props = compat_props; > } Reviewed-by: Thomas Huth