On 11/10/25 10:15, Daan De Meyer wrote:
Preparation for adding support for zstd compressed efi zboot kernel
images.
Signed-off-by: Daan De Meyer <[email protected]>
---
hw/arm/boot.c | 2 +-
hw/core/loader.c | 8 ++++----
hw/nvram/fw_cfg.c | 2 +-
include/hw/loader.h | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/hw/arm/boot.c b/hw/arm/boot.c
index e77d8679d8..c0dec0343a 100644
--- a/hw/arm/boot.c
+++ b/hw/arm/boot.c
@@ -826,7 +826,7 @@ static uint64_t load_aarch64_image(const char *filename,
hwaddr mem_base,
ssize_t size;
/* On aarch64, it's the bootloader's job to uncompress the kernel. */
- size = load_image_gzipped_buffer(filename, LOAD_IMAGE_MAX_GUNZIP_BYTES,
+ size = load_image_gzipped_buffer(filename,
LOAD_IMAGE_MAX_DECOMPRESSED_BYTES,
&buffer);
if (size < 0) {
diff --git a/hw/core/loader.c b/hw/core/loader.c
index 477661a025..42edcf2d98 100644
--- a/hw/core/loader.c
+++ b/hw/core/loader.c
@@ -796,8 +796,8 @@ ssize_t load_image_gzipped_buffer(const char *filename,
uint64_t max_sz,
goto out;
}
- if (max_sz > LOAD_IMAGE_MAX_GUNZIP_BYTES) {
- max_sz = LOAD_IMAGE_MAX_GUNZIP_BYTES;
+ if (max_sz > LOAD_IMAGE_MAX_DECOMPRESSED_BYTES) {
+ max_sz = LOAD_IMAGE_MAX_DECOMPRESSED_BYTES;
}
data = g_malloc(max_sz);
@@ -898,8 +898,8 @@ ssize_t unpack_efi_zboot_image(uint8_t **buffer, ssize_t
*size)
return -1;
}
- data = g_malloc(LOAD_IMAGE_MAX_GUNZIP_BYTES);
- bytes = gunzip(data, LOAD_IMAGE_MAX_GUNZIP_BYTES, *buffer + ploff, plsize);
+ data = g_malloc(LOAD_IMAGE_MAX_DECOMPRESSED_BYTES);
+ bytes = gunzip(data, LOAD_IMAGE_MAX_DECOMPRESSED_BYTES, *buffer + ploff,
plsize);
I'd take the opportunity to introduce a size_t variable, since
patch #3 re-use this definition.
Otherwise,
Reviewed-by: Philippe Mathieu-Daudé <[email protected]>
