diff options
| author | BALATON Zoltan <balaton@eik.bme.hu> | 2021-07-15 18:50:44 +0200 |
|---|---|---|
| committer | David Gibson <david@gibson.dropbear.id.au> | 2021-07-29 10:59:49 +1000 |
| commit | 6ebc0048dd8ff93c2847739599afa630f3d9dabd (patch) | |
| tree | e7c14cd1c25b14fc79ce35a3f9ac8b4dcb5006b2 | |
| parent | 69ea12b19a15ae006521cd5cc0f627f27f738746 (diff) | |
| download | focaccia-qemu-6ebc0048dd8ff93c2847739599afa630f3d9dabd.tar.gz focaccia-qemu-6ebc0048dd8ff93c2847739599afa630f3d9dabd.zip | |
ppc/pegasos2: Fix spurious warning 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> Message-Id: <483ac599a1407b766179aaea2794aed60cc09f53.1626367844.git.balaton@eik.bme.hu> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
| -rw-r--r-- | hw/ppc/pegasos2.c | 2 |
1 files changed, 1 insertions, 1 deletions
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."); } } |