mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

spapr: Don't use weird units for MIN_RMA_SLOF

Browse Source 
MIN_RMA_SLOF records the minimum about of RMA that the SLOF firmware
requires.  It lets us give a meaningful error if the RMA ends up too small,
rather than just letting SLOF crash.

It's currently stored as a number of megabytes, which is strange for global
constants.  Move that megabyte scaling into the definition of the constant
like most other things use.

Change from M to MiB in the associated message while we're at it.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Greg Kurz <groug@kaod.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
This commit is contained in:
David Gibson 2019-12-10 16:25:04 +11:00
parent 4c24a87f66
commit 9943266ec3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/ppc/spapr.c
View File

@ -103,7 +103,7 @@
#define FW_OVERHEAD 0x2800000
#define KERNEL_LOAD_ADDR FW_MAX_SIZE
#define MIN_RMA_SLOF 128UL
#define MIN_RMA_SLOF (128 * MiB)
#define PHANDLE_INTC 0x00001111
@ -2956,10 +2956,10 @@ static void spapr_machine_init(MachineState *machine)
}
}
if (spapr->rma_size < (MIN_RMA_SLOF * MiB)) {
if (spapr->rma_size < MIN_RMA_SLOF) {
error_report(
"pSeries SLOF firmware requires >= %ldM guest RMA (Real Mode Area memory)",
MIN_RMA_SLOF);
"pSeries SLOF firmware requires >= %ldMiB guest RMA (Real Mode Area memory)",
MIN_RMA_SLOF / MiB);
exit(1);
}