Message ID | 20190225142407.9477-3-muriloo@linux.ibm.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | ppc/pnv: increase kernel size limit to 256MiB | expand |
On 2/25/19 8:24 AM, Murilo Opsfelder Araujo wrote: > The current 0x10000000 value is actually 256MiB, not 128MB as the comment > suggests. Move it to a constant and fix the comment (no change in the size > value). > > Signed-off-by: Murilo Opsfelder Araujo <muriloo@linux.ibm.com> > --- > hw/ppc/pnv.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c > index 000707164e..514439db20 100644 > --- a/hw/ppc/pnv.c > +++ b/hw/ppc/pnv.c > @@ -56,6 +56,7 @@ > #define KERNEL_LOAD_ADDR 0x20000000 > #define KERNEL_MAX_SIZE 0x10000000 /* 256MiB */ > #define INITRD_LOAD_ADDR 0x60000000 > +#define INITRD_MAX_SIZE 0x10000000 /* 256MiB */ Why not #include "qemu/units.h" and spell this: #define INITRD_MAX_SIZE (256 * MiB) and so on for the other values?
diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c index 000707164e..514439db20 100644 --- a/hw/ppc/pnv.c +++ b/hw/ppc/pnv.c @@ -56,6 +56,7 @@ #define KERNEL_LOAD_ADDR 0x20000000 #define KERNEL_MAX_SIZE 0x10000000 /* 256MiB */ #define INITRD_LOAD_ADDR 0x60000000 +#define INITRD_MAX_SIZE 0x10000000 /* 256MiB */ static const char *pnv_chip_core_typename(const PnvChip *o) { @@ -601,7 +602,7 @@ static void pnv_init(MachineState *machine) if (machine->initrd_filename) { pnv->initrd_base = INITRD_LOAD_ADDR; pnv->initrd_size = load_image_targphys(machine->initrd_filename, - pnv->initrd_base, 0x10000000); /* 128MB max */ + pnv->initrd_base, INITRD_MAX_SIZE); if (pnv->initrd_size < 0) { error_report("Could not load initial ram disk '%s'", machine->initrd_filename);
The current 0x10000000 value is actually 256MiB, not 128MB as the comment suggests. Move it to a constant and fix the comment (no change in the size value). Signed-off-by: Murilo Opsfelder Araujo <muriloo@linux.ibm.com> --- hw/ppc/pnv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)