Message ID | 1449459280-14983-2-git-send-email-david@gibson.dropbear.id.au |
---|---|
State | New |
Headers | show |
On 12/07/2015 02:34 PM, David Gibson wrote: > 98cec76 "machine: Set MachineClass::name automatically" removed the setting > of mc->name for the pseries machine types, since it can be derived > automatically from the type names constructed with MACHINE_TYPE_NAME(). > > Unfortunately fb0fc8f "spapr: Create pseries-2.5 machine" went in later and > brought one of them back. > > This removes it again. > > Signed-off-by: David Gibson <david@gibson.dropbear.id.au> > Reviewed-by: Thomas Huth <thuth@redhat.com> > --- > hw/ppc/spapr.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 29a16b7..a69856f 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -2440,7 +2440,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->name = "pseries-2.5"; > mc->desc = "pSeries Logical Partition (PAPR compliant) v2.5"; > mc->alias = "pseries"; > mc->is_default = 1; > Reviewed-by: Alexey Kardashevskiy <aik@ozlabs.ru>
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 29a16b7..a69856f 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2440,7 +2440,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->name = "pseries-2.5"; mc->desc = "pSeries Logical Partition (PAPR compliant) v2.5"; mc->alias = "pseries"; mc->is_default = 1;