diff options
| author | David Gibson | 2015-11-30 06:36:49 +0100 |
|---|---|---|
| committer | David Gibson | 2016-01-11 05:29:04 +0100 |
| commit | aec39c5349acc4b33711288abbbaf747e21b04b7 (patch) | |
| tree | 8fcd4cbf6020ed1e90454b175e7f31bd3e6e689d | |
| parent | spapr: Add /system-id (diff) | |
| download | qemu-aec39c5349acc4b33711288abbbaf747e21b04b7.tar.gz qemu-aec39c5349acc4b33711288abbbaf747e21b04b7.tar.xz qemu-aec39c5349acc4b33711288abbbaf747e21b04b7.zip | |
pseries: Remove redundant setting of mc->name for pseries-2.5 machine
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>
| -rw-r--r-- | hw/ppc/spapr.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 29a16b7451..a69856f55a 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; |