[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PULL 07/16] pseries: Remove versions from mc->desc
From: |
David Gibson |
Subject: |
[Qemu-ppc] [PULL 07/16] pseries: Remove versions from mc->desc |
Date: |
Mon, 11 Jan 2016 15:37:29 +1100 |
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 <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Reviewed-by: Alexey Kardashevskiy <address@hidden>
---
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;
}
--
2.5.0
- [Qemu-ppc] [PULL 16/16] hw/ppc/spapr: fix spapr->kvm_type leak, (continued)
- [Qemu-ppc] [PULL 16/16] hw/ppc/spapr: fix spapr->kvm_type leak, David Gibson, 2016/01/10
- [Qemu-ppc] [PULL 09/16] pseries: Use SET_MACHINE_COMPAT, David Gibson, 2016/01/10
- [Qemu-ppc] [PULL 10/16] pseries: DEFINE_SPAPR_MACHINE, David Gibson, 2016/01/10
- [Qemu-ppc] [PULL 12/16] pseries: Improve setting of default machine version, David Gibson, 2016/01/10
- [Qemu-ppc] [PULL 15/16] spapr vio: fix to incomplete QOMify, David Gibson, 2016/01/10
- [Qemu-ppc] [PULL 04/16] pseries: Remove redundant setting of mc->name for pseries-2.5 machine, David Gibson, 2016/01/10
- [Qemu-ppc] [PULL 13/16] pseries: Add pseries-2.6 machine type, David Gibson, 2016/01/10
- [Qemu-ppc] [PULL 01/16] hw/ppc/spapr_rtc: Remove bad class_size value, David Gibson, 2016/01/10
- [Qemu-ppc] [PULL 02/16] target-ppc: Define kvmppc_read_int_dt(), David Gibson, 2016/01/10
- [Qemu-ppc] [PULL 03/16] spapr: Add /system-id, David Gibson, 2016/01/10
- [Qemu-ppc] [PULL 07/16] pseries: Remove versions from mc->desc,
David Gibson <=
- [Qemu-ppc] [PULL 08/16] Move SET_MACHINE_COMPAT macro to boards.h, David Gibson, 2016/01/10
- [Qemu-ppc] [PULL 06/16] pseries: Remove redundant calls to spapr_machine_initfn(), David Gibson, 2016/01/10
- [Qemu-ppc] [PULL 11/16] pseries: Restructure class_options functions, David Gibson, 2016/01/10
- [Qemu-ppc] [PULL 05/16] pseries: Rearrange versioned machine type code, David Gibson, 2016/01/10
- Re: [Qemu-ppc] [PULL 00/16] ppc-for-2.6 queue 20160111, Peter Maydell, 2016/01/11