]> git.proxmox.com Git - mirror_qemu.git/commitdiff
pseries: Remove redundant setting of mc->name for pseries-2.5 machine
authorDavid Gibson <david@gibson.dropbear.id.au>
Mon, 30 Nov 2015 05:36:49 +0000 (16:36 +1100)
committerDavid Gibson <david@gibson.dropbear.id.au>
Mon, 11 Jan 2016 04:29:04 +0000 (15:29 +1100)
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>
Reviewed-by: Alexey Kardashevskiy <aik@ozlabs.ru>
hw/ppc/spapr.c

index 29a16b74519b3396e765803942cc369416cac9dc..a69856f55a136cd5e3c8da5802543c9d406a3817 100644 (file)
@@ -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;