diff options
| author | Bharata B Rao <bharata@linux.vnet.ibm.com> | 2016-01-19 10:09:21 +0530 |
|---|---|---|
| committer | David Gibson <david@gibson.dropbear.id.au> | 2016-01-30 23:37:37 +1100 |
| commit | 16c25aef5362c6dd99c54fec78936ec3c10dc513 (patch) | |
| tree | 63d67c69528c349c69666c2dff86ea0bb5c4b14d /hw/ppc/spapr.c | |
| parent | 27ac3e06d59a2c37cdc5997f65ff82e104ec798a (diff) | |
| download | focaccia-qemu-16c25aef5362c6dd99c54fec78936ec3c10dc513.tar.gz focaccia-qemu-16c25aef5362c6dd99c54fec78936ec3c10dc513.zip | |
spapr: Don't create ibm,dynamic-reconfiguration-memory w/o DR LMBs
If guest doesn't have any dynamically reconfigurable (DR) logical memory blocks (LMB), then we shouldn't create ibm,dynamic-reconfiguration-memory device tree node. Signed-off-by: Bharata B Rao <bharata@linux.vnet.ibm.com> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Diffstat (limited to 'hw/ppc/spapr.c')
| -rw-r--r-- | hw/ppc/spapr.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 08da895cba..0ac636890c 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -764,6 +764,13 @@ static int spapr_populate_drconf_memory(sPAPRMachineState *spapr, void *fdt) int nr_nodes = nb_numa_nodes ? nb_numa_nodes : 1; /* + * Don't create the node if there are no DR LMBs. + */ + if (!nr_lmbs) { + return 0; + } + + /* * Allocate enough buffer size to fit in ibm,dynamic-memory * or ibm,associativity-lookup-arrays */ @@ -869,7 +876,7 @@ int spapr_h_cas_compose_response(sPAPRMachineState *spapr, _FDT((spapr_fixup_cpu_dt(fdt, spapr))); } - /* Generate memory nodes or ibm,dynamic-reconfiguration-memory node */ + /* Generate ibm,dynamic-reconfiguration-memory node if required */ if (memory_update && smc->dr_lmb_enabled) { _FDT((spapr_populate_drconf_memory(spapr, fdt))); } |