From c924f749cecf97f2dd54c1d599a7f3529f8be365 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9ctor=20Or=C3=B3n=20Mart=C3=ADnez?= Date: Tue, 21 Aug 2018 01:51:21 +0200 Subject: [PATCH 2/4] Revert "tests: Correction to vg_prepare_blob()" This reverts commit 85bce8b2f06d17a909d9e20358630a2034f381ff. --- tests/testutils.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/tests/testutils.c b/tests/testutils.c index 6d5883f..9276bbb 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -166,22 +166,18 @@ void vg_prepare_blob(void *fdt, size_t bufsize) { char *blob = fdt; int off_memrsv, off_strings, off_struct; - int num_memrsv; size_t size_memrsv, size_strings, size_struct; - off_memrsv = fdt_off_mem_rsvmap(fdt); - num_memrsv = fdt_num_mem_rsv(fdt); - if (num_memrsv < 0) - size_memrsv = fdt_totalsize(fdt) - off_memrsv; - else - size_memrsv = (num_memrsv + 1) - * sizeof(struct fdt_reserve_entry); + size_memrsv = (fdt_num_mem_rsv(fdt) + 1) + * sizeof(struct fdt_reserve_entry); VALGRIND_MAKE_MEM_UNDEFINED(blob, bufsize); VALGRIND_MAKE_MEM_DEFINED(blob, FDT_V1_SIZE); VALGRIND_MAKE_MEM_DEFINED(blob, fdt_header_size(fdt)); if (fdt_magic(fdt) == FDT_MAGIC) { + off_memrsv = fdt_off_mem_rsvmap(fdt); + off_strings = fdt_off_dt_strings(fdt); if (fdt_version(fdt) >= 3) size_strings = fdt_size_dt_strings(fdt); @@ -194,6 +190,8 @@ void vg_prepare_blob(void *fdt, size_t bufsize) else size_struct = fdt_totalsize(fdt) - off_struct; } else if (fdt_magic(fdt) == FDT_SW_MAGIC) { + off_memrsv = fdt_off_mem_rsvmap(fdt); + size_strings = fdt_size_dt_strings(fdt); off_strings = fdt_off_dt_strings(fdt) - size_strings; -- 2.18.0