From d0abc1092c0528a5ebecadc5fc993e9f4c3b9f09 Mon Sep 17 00:00:00 2001 From: Luigi Leonardi Date: Mon, 15 Dec 2025 16:58:44 +0100 Subject: [PATCH 1/2] igvm_c: clean up unused code and printf format warnings `test_igvm` and `dump_igvm` contained an unused function, unused variables and format specifier mismatch in printf. No functional changes. Signed-off-by: Luigi Leonardi --- igvm_c/sample/dump_igvm.c | 27 +++++++-------------------- igvm_c/tests/igvm_test.c | 2 -- 2 files changed, 7 insertions(+), 22 deletions(-) diff --git a/igvm_c/sample/dump_igvm.c b/igvm_c/sample/dump_igvm.c index 7dd4748..3611d01 100644 --- a/igvm_c/sample/dump_igvm.c +++ b/igvm_c/sample/dump_igvm.c @@ -256,42 +256,29 @@ static void igvm_dump_variable_header(IGVM_VHS_VARIABLE_HEADER *header) printf("\n"); } -static void igvm_dump_fixed_header(IGVM_FIXED_HEADER *header) -{ - printf("IGVM_FIXED_HEADER:\n"); - printf(" Magic: 0x%08X\n", header->magic); - printf(" FormatVersion: 0x%08X\n", header->format_version); - printf(" VariableHeaderOffset: 0x%08X\n", - header->variable_header_offset); - printf(" VariableHeaderSize: 0x%08X\n", header->variable_header_size); - printf(" TotalFileSize: 0x%08X\n", header->total_file_size); - printf(" Checksum: 0x%08X\n", header->checksum); - printf("\n"); -} - static int dump_igvm(uint8_t* igvm_buf, unsigned long igvm_length) { IgvmHandle igvm; if ((igvm = igvm_new_from_binary(igvm_buf, igvm_length)) < 0) { - printf("Failed to parse IGVM file. Error code: %ld\n", igvm); + printf("Failed to parse IGVM file. Error code: %d\n", igvm); return 1; } for (long section = 0; section <= IGVM_HEADER_SECTION_DIRECTIVE; ++section) { int32_t count = igvm_header_count(igvm, (IgvmHeaderSection)section); printf("----------------------------------------------------------\n" - "%s count = %ld\n\n", + "%s count = %d\n\n", section_name[section], count); - + for (long i = 0; i < count; ++i) { IgvmVariableHeaderType typ = igvm_get_header_type(igvm, section, i); if (typ > 0) { IgvmHandle header_handle; IgvmHandle header_data; - + header_handle = igvm_get_header(igvm, section, i); if (header_handle < 0) { - printf("Invalid header (%ld)\n", header_handle); + printf("Invalid header (%d)\n", header_handle); return 1; } igvm_dump_variable_header((IGVM_VHS_VARIABLE_HEADER*)igvm_get_buffer(igvm, header_handle)); @@ -300,8 +287,8 @@ static int dump_igvm(uint8_t* igvm_buf, unsigned long igvm_length) /* Do the same for any associated file data */ header_data = igvm_get_header_data(igvm, section, i); if (header_data > 0) { - uint32_t filedata_length = igvm_get_buffer_size(igvm, header_data); - printf("Got %u bytes of file data:\n", filedata_length); + int32_t filedata_length = igvm_get_buffer_size(igvm, header_data); + printf("Got %d bytes of file data:\n", filedata_length); hexdump(igvm_get_buffer(igvm, header_data), (filedata_length > hex_context) ? hex_context : filedata_length, 32, 0); igvm_free_buffer(igvm, header_data); } diff --git a/igvm_c/tests/igvm_test.c b/igvm_c/tests/igvm_test.c index a5259aa..6b64926 100644 --- a/igvm_c/tests/igvm_test.c +++ b/igvm_c/tests/igvm_test.c @@ -23,7 +23,6 @@ void test_valid_igvm(void) { } void test_invalid_fixed_header(void) { - IgvmHandle igvm; CU_ASSERT_EQUAL(igvm_new_from_binary(invalid_igvm_buf, sizeof(invalid_igvm_buf)), IGVMAPI_INVALID_FIXED_HEADER); } @@ -194,7 +193,6 @@ void test_associated_data(void) { void test_no_associated_data(void) { IgvmHandle igvm; - uint32_t data_length = 0; igvm = igvm_new_from_binary(igvm_buf, igvm_buf_length); CU_ASSERT(igvm > 0); From f3ba25985211b5891f94cf935bf3e6979f13fa2b Mon Sep 17 00:00:00 2001 From: Luigi Leonardi Date: Wed, 7 Jan 2026 10:41:32 +0100 Subject: [PATCH 2/2] igvm_c/Makefile: add compiler flags Add `Wall` and `Wextra` flags to CFLAGS. Signed-off-by: Luigi Leonardi --- igvm_c/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/igvm_c/Makefile b/igvm_c/Makefile index 5703abc..49fec7d 100644 --- a/igvm_c/Makefile +++ b/igvm_c/Makefile @@ -12,7 +12,7 @@ EXE = PREFIX ?= /usr DESTDIR ?= -CFLAGS ?= -g3 -O0 +CFLAGS ?= -g3 -O0 -Wall -Wextra CARGO=CARGO_TARGET_DIR=$(IGVM_DIR)/$(TARGET_DIR) cargo CARGO_BUILD_HOST := $(shell $(CARGO) -Vv | sed -n 's,^host: ,,p')