mirror of
https://github.com/izzy2lost/xemu.git
synced 2026-07-06 00:20:22 -07:00
ppc/spapr: remove deprecated machine pseries-4.2
Remove the pseries-4.2 machine specific logic as had been deprecated and due for removal now as per policy. Suggested-by: Cédric Le Goater <clg@kaod.org> Reviewed-by: Cédric Le Goater <clg@redhat.com> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> Link: https://lore.kernel.org/qemu-devel/20251021084346.73671-12-philmd@linaro.org Signed-off-by: Harsh Prateek Bora <harshpb@linux.ibm.com>
This commit is contained in:
@@ -2729,7 +2729,6 @@ static PCIHostState *spapr_create_default_phb(void)
|
||||
static hwaddr spapr_rma_size(SpaprMachineState *spapr, Error **errp)
|
||||
{
|
||||
MachineState *machine = MACHINE(spapr);
|
||||
SpaprMachineClass *smc = SPAPR_MACHINE_GET_CLASS(spapr);
|
||||
hwaddr rma_size = machine->ram_size;
|
||||
hwaddr node0_size = spapr_node0_size(machine);
|
||||
|
||||
@@ -2742,15 +2741,6 @@ static hwaddr spapr_rma_size(SpaprMachineState *spapr, Error **errp)
|
||||
*/
|
||||
rma_size = MIN(rma_size, 1 * TiB);
|
||||
|
||||
/*
|
||||
* Clamp the RMA size based on machine type. This is for
|
||||
* migration compatibility with older qemu versions, which limited
|
||||
* the RMA size for complicated and mostly bad reasons.
|
||||
*/
|
||||
if (smc->rma_limit) {
|
||||
rma_size = MIN(rma_size, smc->rma_limit);
|
||||
}
|
||||
|
||||
if (rma_size < MIN_RMA_SLOF) {
|
||||
error_setg(errp,
|
||||
"pSeries SLOF firmware requires >= %" HWADDR_PRIx
|
||||
@@ -4913,23 +4903,6 @@ static void spapr_machine_5_0_class_options(MachineClass *mc)
|
||||
|
||||
DEFINE_SPAPR_MACHINE(5, 0);
|
||||
|
||||
/*
|
||||
* pseries-4.2
|
||||
*/
|
||||
static void spapr_machine_4_2_class_options(MachineClass *mc)
|
||||
{
|
||||
SpaprMachineClass *smc = SPAPR_MACHINE_CLASS(mc);
|
||||
|
||||
spapr_machine_5_0_class_options(mc);
|
||||
compat_props_add(mc->compat_props, hw_compat_4_2, hw_compat_4_2_len);
|
||||
smc->default_caps.caps[SPAPR_CAP_CCF_ASSIST] = SPAPR_CAP_OFF;
|
||||
smc->default_caps.caps[SPAPR_CAP_FWNMI] = SPAPR_CAP_OFF;
|
||||
smc->rma_limit = 16 * GiB;
|
||||
mc->nvdimm_supported = false;
|
||||
}
|
||||
|
||||
DEFINE_SPAPR_MACHINE(4, 2);
|
||||
|
||||
static void spapr_machine_register_types(void)
|
||||
{
|
||||
type_register_static(&spapr_machine_info);
|
||||
|
||||
@@ -141,7 +141,6 @@ struct SpaprCapabilities {
|
||||
struct SpaprMachineClass {
|
||||
MachineClass parent_class;
|
||||
|
||||
hwaddr rma_limit; /* clamp the RMA to this size */
|
||||
bool pre_5_1_assoc_refpoints;
|
||||
bool pre_5_2_numa_associativity;
|
||||
bool pre_6_2_numa_affinity;
|
||||
|
||||
Reference in New Issue
Block a user