From nobody Tue Feb 10 04:14:39 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1763987879; cv=none; d=zohomail.com; s=zohoarc; b=Ny5HUxZ5o/j5gyIYjkqJca5kw2tJV7edv2FmzmTmuEJT5g8Fd1/VmKTfbeI4cL9tPPA8ZwKsZkM1Y5ZvDeiAU33uZ0f8eFElbkdK3jr04maa76DM6PNByhR4x4PGKft6jMxN6BDqpwnaBVXtAxtWOlrzWVDYvOi9+RxaHXU+GUA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763987879; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Zo8S7nGNognO0/VxU7MQDCfV+i+r6phHemy20JEw9V4=; b=MJjhdFsgXIOgOIEKrLp8SVme9YU4GlYp98cfinKX4bjvwg3ALLEBkBzbM3SKzCVz9ZC2ElXFLZEK1+H6QMnlFu0c+MaEXt8fOcgYDLIXgAmp7b8POjXW0iGkVuUBGKGalJxMmpHcRqvFuMBtcrBD+imSPFh+lVAydPVZEwH1iZU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1763987879832676.5298559715446; Mon, 24 Nov 2025 04:37:59 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vNVpG-0000mF-6d; Mon, 24 Nov 2025 07:37:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vNVnT-0004Zh-1Z for qemu-devel@nongnu.org; Mon, 24 Nov 2025 07:36:00 -0500 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vNVnO-0007J4-RE for qemu-devel@nongnu.org; Mon, 24 Nov 2025 07:35:57 -0500 Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-42b3377aaf2so2424719f8f.2 for ; Mon, 24 Nov 2025 04:35:37 -0800 (PST) Received: from daandemeyer-fedora-PC1EV17T (d54C349CA.access.telenet.be. [84.195.73.202]) by smtp.googlemail.com with ESMTPSA id ffacd0b85a97d-42cb7fd8c47sm29398449f8f.38.2025.11.24.04.35.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Nov 2025 04:35:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1763987736; x=1764592536; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Zo8S7nGNognO0/VxU7MQDCfV+i+r6phHemy20JEw9V4=; b=hl0laNLFx+bnZhjQcsAWocNzLN2Gbm7VozcaaQRekqRsoyM3w5qmvzHuKc1tAawWcT 97TW96Vy+FQyHGUmRe4xJoxLOaGJabgsRmrtXaWSYPt8P2kw8QYHcuVFTQ2JWVe6bxq1 TGMbArDBGW9ckmBh38F1vOAWEC1DV/zLJlzc+r24pQF8qiWM9TyRf0lB45cv2r2XpKNY bQNtaD2iau5TfJRIUcLXHtdEV+oUuhde+ndAY6wQGPnQ3YKTCC4AkIKnucYR5CkTBIec RiSD8Wtpq/wOs3RPuf5sXF7oerOGbCGfPpzEdG5jKIUXp7pOg5SEb/1uyWrQ8UTp44Bv f4RA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763987736; x=1764592536; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=Zo8S7nGNognO0/VxU7MQDCfV+i+r6phHemy20JEw9V4=; b=Oi51f7YXBAPouungMdye/iQajrhLV8D3MYiLM/KzdTMSSnZ9Pxw0InS+W30n/juxZ8 /IryZdxcqEfV5a57suArJaRknC4/8RVjgypPdLwl4Xcb/nnye0Xdp4NBp/OMv3BWxep0 /gSSgdMiScmjFiE7cZSOC5DU6n+p/dFhZlo8HbJxXIdDwhxUdil+/O/D6/J0V+xRWwvp S9Zp5vUinFkymKDjJZ3SSHeTa1HaVvoVADK/Dg1qqBLdEQUeoYJ71WSk5RmA7GwoeWIB cKIJ80GTS5mj1VwouoOr0G3B930w/akATCZwDYF6oxwdESTYf8XaPUm2jpEI14CJgVYR 4gOg== X-Gm-Message-State: AOJu0YwbQAxfnF0gJ/2fk66zUAwMg2s9GEGMTcrnkpFD5kwOrFA1b0lq iMPa/ylwbnL7yU7+pAEfpZZg21Tum+rDUaawJaGO6CoElXNK0iqtlGmbFXFKk7IL X-Gm-Gg: ASbGncuk4MHnRZQL45BTd7NiLP8frYwUB0ZGwtJlUUSVzdd0EX1Fh4TDZgimiwDLUW0 /4cEefwmQnONT+Erpg98aFVd49YktjS5WDA/SpyEdPhgiYF8XcJEo5FtFbu86uamBtz/7qcgC5s gzx+eylWQbbwBKvx9Jj2al+tHmvZYdtd3l7K7AycT6ZzxtQmti6vblH4DHZuPxTtYuiEr2b7GGI zZlw8qyri9vT89Ei6nhoVvhAJdiV3rEead41+AFJ3Q4eqPK/+CBuKg3qnWV60147WHNzcnKvbFi YrQS02q4ar7XvyRVsGp9ixVhxYGdfl35tQ0JVT7BhUQ8veCCzkZNkE64tgmRj3us1ld2dXMNlPH WFeHI38XM3YtHoLOmd8pQ3B7cA9Z+YJ9JD7eQf39GTz3QLV9h/ro2hzV//xlvrX0/aB6zFDL19m JIFmRWMrrH+V4XihAqeVd2Tu99hLNaQFtIfrGyKQpbwJitNXoplG0qACWz3cb1keEytQ== X-Google-Smtp-Source: AGHT+IE5mjXUbXSUZPQGflsVQ11nsrXwNUCOuTNCM4sjec3tFflPiDznw+y9XZKWYlcz/CfBnpkH5w== X-Received: by 2002:a05:6000:1445:b0:42b:5448:7b06 with SMTP id ffacd0b85a97d-42cc1cbce56mr11971189f8f.13.1763987735897; Mon, 24 Nov 2025 04:35:35 -0800 (PST) From: Daan De Meyer To: qemu-devel@nongnu.org Cc: Aleksandar Rikalo , Paul Burton , qemu-arm@nongnu.org, Gerd Hoffmann , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Daan De Meyer , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v4 1/4] Rename LOAD_IMAGE_MAX_GUNZIP_BYTES to LOAD_IMAGE_MAX_DECOMPRESSED_BYTES Date: Mon, 24 Nov 2025 13:35:18 +0100 Message-ID: <20251124123521.1058183-2-daan.j.demeyer@gmail.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251124123521.1058183-1-daan.j.demeyer@gmail.com> References: <20251124123521.1058183-1-daan.j.demeyer@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=daan.j.demeyer@gmail.com; helo=mail-wr1-x435.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1763987880266019200 Preparation for adding support for zstd compressed efi zboot kernel images. Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Daan De Meyer --- hw/arm/boot.c | 4 ++-- hw/core/loader.c | 9 +++++---- hw/nvram/fw_cfg.c | 2 +- include/hw/loader.h | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/hw/arm/boot.c b/hw/arm/boot.c index b91660208f..6cf8a4b7fd 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -823,11 +823,11 @@ static uint64_t load_aarch64_image(const char *filena= me, hwaddr mem_base, hwaddr kernel_load_offset =3D KERNEL64_LOAD_ADDR; uint64_t kernel_size =3D 0; uint8_t *buffer; + size_t max_size =3D LOAD_IMAGE_MAX_DECOMPRESSED_BYTES; ssize_t size; =20 /* On aarch64, it's the bootloader's job to uncompress the kernel. */ - size =3D load_image_gzipped_buffer(filename, LOAD_IMAGE_MAX_GUNZIP_BYT= ES, - &buffer); + size =3D load_image_gzipped_buffer(filename, max_size, &buffer); =20 if (size < 0) { gsize len; diff --git a/hw/core/loader.c b/hw/core/loader.c index 590c5b02aa..f940b6a227 100644 --- a/hw/core/loader.c +++ b/hw/core/loader.c @@ -814,8 +814,8 @@ ssize_t load_image_gzipped_buffer(const char *filename,= uint64_t max_sz, goto out; } =20 - if (max_sz > LOAD_IMAGE_MAX_GUNZIP_BYTES) { - max_sz =3D LOAD_IMAGE_MAX_GUNZIP_BYTES; + if (max_sz > LOAD_IMAGE_MAX_DECOMPRESSED_BYTES) { + max_sz =3D LOAD_IMAGE_MAX_DECOMPRESSED_BYTES; } =20 data =3D g_malloc(max_sz); @@ -885,6 +885,7 @@ ssize_t unpack_efi_zboot_image(uint8_t **buffer, ssize_= t *size) uint8_t *data =3D NULL; ssize_t ploff, plsize; ssize_t bytes; + size_t max_bytes =3D LOAD_IMAGE_MAX_DECOMPRESSED_BYTES; =20 /* ignore if this is too small to be a EFI zboot image */ if (*size < sizeof(*header)) { @@ -916,8 +917,8 @@ ssize_t unpack_efi_zboot_image(uint8_t **buffer, ssize_= t *size) return -1; } =20 - data =3D g_malloc(LOAD_IMAGE_MAX_GUNZIP_BYTES); - bytes =3D gunzip(data, LOAD_IMAGE_MAX_GUNZIP_BYTES, *buffer + ploff, p= lsize); + data =3D g_malloc(max_bytes); + bytes =3D gunzip(data, max_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, =20 if (try_decompress) { size =3D load_image_gzipped_buffer(image_name, - LOAD_IMAGE_MAX_GUNZIP_BYTES, &dat= a); + LOAD_IMAGE_MAX_DECOMPRESSED_BYTES= , &data); } =20 if (size =3D=3D (size_t)-1) { diff --git a/include/hw/loader.h b/include/hw/loader.h index d035e72748..3371de506f 100644 --- a/include/hw/loader.h +++ b/include/hw/loader.h @@ -82,7 +82,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) =20 ssize_t load_image_gzipped_buffer(const char *filename, uint64_t max_sz, uint8_t **buffer); --=20 2.51.1