Preparation for adding support for zstd compressed efi zboot kernel
images.
Signed-off-by: Daan De Meyer <daan.j.demeyer@gmail.com>
---
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);
if (bytes < 0) {
fprintf(stderr, "failed to decompress EFI zboot image\n");
g_free(data);
diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c
index aa24050493..af3b112524 100644
--- a/hw/nvram/fw_cfg.c
+++ b/hw/nvram/fw_cfg.c
@@ -1115,7 +1115,7 @@ void load_image_to_fw_cfg(FWCfgState *fw_cfg, uint16_t size_key,
if (try_decompress) {
size = load_image_gzipped_buffer(image_name,
- LOAD_IMAGE_MAX_GUNZIP_BYTES, &data);
+ LOAD_IMAGE_MAX_DECOMPRESSED_BYTES, &data);
}
if (size == (size_t)-1) {
diff --git a/include/hw/loader.h b/include/hw/loader.h
index c96b5e141c..24b91ba02b 100644
--- a/include/hw/loader.h
+++ b/include/hw/loader.h
@@ -80,7 +80,7 @@ ssize_t load_image_mr(const char *filename, MemoryRegion *mr);
* load_image_gzipped_buffer() will read. It prevents
* g_malloc() in those functions from allocating a huge amount of memory.
*/
-#define LOAD_IMAGE_MAX_GUNZIP_BYTES (256 << 20)
+#define LOAD_IMAGE_MAX_DECOMPRESSED_BYTES (256 << 20)
ssize_t load_image_gzipped_buffer(const char *filename, uint64_t max_sz,
uint8_t **buffer);
--
2.51.0On 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 <daan.j.demeyer@gmail.com> > --- > 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/include/hw/loader.h b/include/hw/loader.h > index c96b5e141c..24b91ba02b 100644 > --- a/include/hw/loader.h > +++ b/include/hw/loader.h > @@ -80,7 +80,7 @@ ssize_t load_image_mr(const char *filename, MemoryRegion *mr); > * load_image_gzipped_buffer() will read. It prevents > * g_malloc() in those functions from allocating a huge amount of memory. > */ > -#define LOAD_IMAGE_MAX_GUNZIP_BYTES (256 << 20) > +#define LOAD_IMAGE_MAX_DECOMPRESSED_BYTES (256 << 20) Maybe also rename UBOOT_MAX_GUNZIP_BYTES for coherency.
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 <daan.j.demeyer@gmail.com> > --- > 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(-) Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
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 <daan.j.demeyer@gmail.com>
> ---
> 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é <philmd@linaro.org>
On Sat, Oct 11, 2025 at 10:15:51AM +0200, Daan De Meyer wrote: > Preparation for adding support for zstd compressed efi zboot kernel > images. > > Signed-off-by: Daan De Meyer <daan.j.demeyer@gmail.com> > --- > 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(-) Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> With regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
© 2016 - 2026 Red Hat, Inc.