Message ID | 483ac599a1407b766179aaea2794aed60cc09f53.1626367844.git.balaton@eik.bme.hu |
---|---|
State | New |
Headers | show |
Series | Misc pegasos2 fixes | expand |
On Thu, Jul 15, 2021 at 06:50:44PM +0200, BALATON Zoltan wrote: > The -append option is currently not compatible with -bios (as we don't > yet emulate nvram so we can only put it in the environment with VOF). > Therefore a warning is printed if -append is used with -bios but > because the default value of kernel_cmdline seems to be an empty > string instead of NULL this warning was printed even without -append > when -bios is used. Only print warning if -append is given. > > Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu> Applied to ppc-for-6.1. > --- > hw/ppc/pegasos2.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/hw/ppc/pegasos2.c b/hw/ppc/pegasos2.c > index 9fad1854b1..b8ce859f1a 100644 > --- a/hw/ppc/pegasos2.c > +++ b/hw/ppc/pegasos2.c > @@ -191,7 +191,7 @@ static void pegasos2_init(MachineState *machine) > warn_report("Option -kernel may be ineffective with -bios."); > } > } > - if (machine->kernel_cmdline && !pm->vof) { > + if (!pm->vof && machine->kernel_cmdline && machine->kernel_cmdline[0]) { > warn_report("Option -append may be ineffective with -bios."); > } > }
diff --git a/hw/ppc/pegasos2.c b/hw/ppc/pegasos2.c index 9fad1854b1..b8ce859f1a 100644 --- a/hw/ppc/pegasos2.c +++ b/hw/ppc/pegasos2.c @@ -191,7 +191,7 @@ static void pegasos2_init(MachineState *machine) warn_report("Option -kernel may be ineffective with -bios."); } } - if (machine->kernel_cmdline && !pm->vof) { + if (!pm->vof && machine->kernel_cmdline && machine->kernel_cmdline[0]) { warn_report("Option -append may be ineffective with -bios."); } }
The -append option is currently not compatible with -bios (as we don't yet emulate nvram so we can only put it in the environment with VOF). Therefore a warning is printed if -append is used with -bios but because the default value of kernel_cmdline seems to be an empty string instead of NULL this warning was printed even without -append when -bios is used. Only print warning if -append is given. Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu> --- hw/ppc/pegasos2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)