diff options
| author | Bharata B Rao <bharata@linux.vnet.ibm.com> | 2016-01-19 10:09:21 +0530 |
|---|---|---|
| committer | Timothy Pearson <tpearson@raptorengineering.com> | 2019-11-29 19:30:22 -0600 |
| commit | 9864221550e8df1087bf91d219da4a5e3b7e0536 (patch) | |
| tree | 1dbb94d30aaaa0ebc9aed49e8de236e671f24cbe | |
| parent | 66ad57d4abe1119a435c76db8d5e2c7248c181d6 (diff) | |
| download | hqemu-9864221550e8df1087bf91d219da4a5e3b7e0536.zip hqemu-9864221550e8df1087bf91d219da4a5e3b7e0536.tar.gz | |
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>
| -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 08da895..0ac6368 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))); } |
