[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 1/5] ppc/pegasos2: Fix spurious warning with -bios
From: |
David Gibson |
Subject: |
[PULL 1/5] ppc/pegasos2: Fix spurious warning with -bios |
Date: |
Thu, 29 Jul 2021 17:01:31 +1000 |
From: BALATON Zoltan <balaton@eik.bme.hu>
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>
---
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.");
}
}
--
2.31.1
- [PULL 0/5] ppc-for-6.1 queue 20210729, David Gibson, 2021/07/29
- [PULL 2/5] i2c/smbus_eeprom: Add feature bit to SPD data, David Gibson, 2021/07/29
- [PULL 3/5] target/ppc: Ease L=0 requirement on cmp/cmpi/cmpl/cmpli for ppc32, David Gibson, 2021/07/29
- [PULL 4/5] ppc/vof: Fix Coverity issues, David Gibson, 2021/07/29
- [PULL 5/5] kvm: ppc: Print meaningful message on KVM_CREATE_VM failure, David Gibson, 2021/07/29
- [PULL 1/5] ppc/pegasos2: Fix spurious warning with -bios,
David Gibson <=
- Re: [PULL 0/5] ppc-for-6.1 queue 20210729, Peter Maydell, 2021/07/29