Reviewed-by: Daniel P. Berrangé <[email protected]>
Reviewed-by: Philippe Mathieu-Daudé <[email protected]>
Tested-by: Philippe Mathieu-Daudé <[email protected]>
Signed-off-by: Daan De Meyer <[email protected]>
---
hw/core/loader.c | 30 +++++++++++++++++++++---------
1 file changed, 21 insertions(+), 9 deletions(-)
diff --git a/hw/core/loader.c b/hw/core/loader.c
index d74e33ceb6..8924767e7d 100644
--- a/hw/core/loader.c
+++ b/hw/core/loader.c
@@ -68,6 +68,11 @@
#include <zlib.h>
+#ifdef CONFIG_ZSTD
+#include <zstd.h>
+#include <zstd_errors.h>
+#endif
+
static int roms_loaded;
/* return the size or -1 if error */
@@ -901,14 +906,6 @@ ssize_t unpack_efi_zboot_image(uint8_t **buffer, ssize_t
*size)
return 0;
}
- if (strcmp(header->compression_type, "gzip") != 0) {
- fprintf(stderr,
- "unable to handle EFI zboot image with \"%.*s\" compression\n",
- (int)sizeof(header->compression_type) - 1,
- header->compression_type);
- return -1;
- }
-
ploff = ldl_le_p(&header->payload_offset);
plsize = ldl_le_p(&header->payload_size);
@@ -918,7 +915,22 @@ ssize_t unpack_efi_zboot_image(uint8_t **buffer, ssize_t
*size)
}
data = g_malloc(max_bytes);
- bytes = gunzip(data, max_bytes, *buffer + ploff, plsize);
+
+ if (strcmp(header->compression_type, "gzip") == 0) {
+ bytes = gunzip(data, max_bytes, *buffer + ploff, plsize);
+#ifdef CONFIG_ZSTD
+ } else if (strcmp(header->compression_type, "zstd") == 0) {
+ size_t ret = ZSTD_decompress(data, max_bytes, *buffer + ploff, plsize);
+ bytes = ZSTD_isError(ret) ? -1 : (ssize_t) ret;
+#endif
+ } else {
+ fprintf(stderr,
+ "unable to handle EFI zboot image with \"%.*s\" compression\n",
+ (int)sizeof(header->compression_type) - 1,
+ header->compression_type);
+ return -1;
+ }
+
if (bytes < 0) {
fprintf(stderr, "failed to decompress EFI zboot image\n");
return -1;
--
2.51.1
