Re: [PATCH] qfw: Don't fail if setup data size is 0

[Tom Rini]

On Wed, May 25, 2022 at 02:38:55PM +0100,  Pierre-Clément Tosi  wrote:

> Skip missing setup data (which is valid) rather than failing with an
> error.
> 
> Cc: Bin Meng 
> Cc: Simon Glass 
> Reported-by: Andrew Walbran 
> Signed-off-by: Pierre-Clément Tosi 

Applied to u-boot/next, thanks!

-- 
Tom


signature.asc
Description: PGP signature

[PATCH] qfw: Don't fail if setup data size is 0

[Pierre-Clément Tosi]

Skip missing setup data (which is valid) rather than failing with an
error.

Cc: Bin Meng 
Cc: Simon Glass 
Reported-by: Andrew Walbran 
Signed-off-by: Pierre-Clément Tosi 
---
 cmd/qfw.c | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/cmd/qfw.c b/cmd/qfw.c
index d58615040c..ccbc967ca9 100644
--- a/cmd/qfw.c
+++ b/cmd/qfw.c
@@ -25,15 +25,17 @@ static int qemu_fwcfg_cmd_setup_kernel(void *load_addr, 
void *initrd_addr)
qfw_read_entry(qfw_dev, FW_CFG_SETUP_SIZE, 4, _size);
qfw_read_entry(qfw_dev, FW_CFG_KERNEL_SIZE, 4, _size);
 
-   if (setup_size == 0 || kernel_size == 0) {
+   if (kernel_size == 0) {
printf("warning: no kernel available\n");
return -1;
}
 
data_addr = load_addr;
-   qfw_read_entry(qfw_dev, FW_CFG_SETUP_DATA,
-  le32_to_cpu(setup_size), data_addr);
-   data_addr += le32_to_cpu(setup_size);
+   if (setup_size != 0) {
+   qfw_read_entry(qfw_dev, FW_CFG_SETUP_DATA,
+  le32_to_cpu(setup_size), data_addr);
+   data_addr += le32_to_cpu(setup_size);
+   }
 
qfw_read_entry(qfw_dev, FW_CFG_KERNEL_DATA,
   le32_to_cpu(kernel_size), data_addr);
-- 
2.36.1.124.g0e6072fb45-goog