From fe2a814a67235344869ddc923f1ccb2f37403a38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Or=C3=B3n=20Mart=C3=ADnez?= <zumbi@debian.org>
Date: Tue, 21 Aug 2018 01:51:32 +0200
Subject: [PATCH 3/4] Revert "tests: Use valgrind client requests for better
 checking"

This reverts commit c14223fb229255c4e7e2719022c77653630ad28c.
---
 .travis.yml                |  1 -
 tests/tests.h              |  1 -
 tests/testutils.c          | 55 +-------------------------------------
 tests/truncated_property.c |  2 --
 tests/truncated_string.c   |  2 --
 5 files changed, 1 insertion(+), 60 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 87adfa0..4af3e60 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,7 +29,6 @@ matrix:
     - addons:
         apt:
           packages:
-            - valgrind
       script:
         - make
         - make check
diff --git a/tests/tests.h b/tests/tests.h
index b7daa26..df38b77 100644
--- a/tests/tests.h
+++ b/tests/tests.h
@@ -119,7 +119,6 @@ const void *check_getprop(void *fdt, int nodeoffset, const char *name,
 #define check_getprop_string(fdt, nodeoffset, name, s) \
 	check_getprop((fdt), (nodeoffset), (name), strlen(s)+1, (s))
 int nodename_eq(const char *s1, const char *s2);
-void vg_prepare_blob(void *fdt, size_t bufsize);
 void *load_blob(const char *filename);
 void *load_blob_arg(int argc, char *argv[]);
 void save_blob(const char *filename, void *blob);
diff --git a/tests/testutils.c b/tests/testutils.c
index 9276bbb..e2b7c8c 100644
--- a/tests/testutils.c
+++ b/tests/testutils.c
@@ -34,9 +34,6 @@
 
 #include "tests.h"
 
-/* For FDT_SW_MAGIC */
-#include "libfdt_internal.h"
-
 int verbose_test = 1;
 char *test_name;
 
@@ -162,64 +159,14 @@ int nodename_eq(const char *s1, const char *s2)
 		return 0;
 }
 
-void vg_prepare_blob(void *fdt, size_t bufsize)
-{
-	char *blob = fdt;
-	int off_memrsv, off_strings, off_struct;
-	size_t size_memrsv, size_strings, size_struct;
-
-	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);
-		else
-			size_strings = fdt_totalsize(fdt) - off_strings;
-
-		off_struct = fdt_off_dt_struct(fdt);
-		if (fdt_version(fdt) >= 17)
-			size_struct = fdt_size_dt_struct(fdt);
-		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;
-
-		off_struct = fdt_off_dt_struct(fdt);
-		size_struct = fdt_size_dt_struct(fdt);
-		size_struct = fdt_totalsize(fdt) - off_struct;
-
-	} else {
-		CONFIG("Bad magic on vg_prepare_blob()");
-	}
-
-	VALGRIND_MAKE_MEM_DEFINED(blob + off_memrsv, size_memrsv);
-	VALGRIND_MAKE_MEM_DEFINED(blob + off_strings, size_strings);
-	VALGRIND_MAKE_MEM_DEFINED(blob + off_struct, size_struct);
-}
-
 void *load_blob(const char *filename)
 {
 	char *blob;
-	size_t len;
-	int ret = utilfdt_read_err(filename, &blob, &len);
+	int ret = utilfdt_read_err(filename, &blob, NULL);
 
 	if (ret)
 		CONFIG("Couldn't open blob from \"%s\": %s", filename,
 		       strerror(ret));
-
-	vg_prepare_blob(blob, len);
-
 	return blob;
 }
 
diff --git a/tests/truncated_property.c b/tests/truncated_property.c
index f4b6770..71619bb 100644
--- a/tests/truncated_property.c
+++ b/tests/truncated_property.c
@@ -36,8 +36,6 @@ int main(int argc, char *argv[])
 
 	test_init(argc, argv);
 
-	vg_prepare_blob(fdt, fdt_totalsize(fdt));
-
 	prop = fdt_getprop(fdt, 0, "truncated", &len);
 	if (prop)
 		FAIL("fdt_getprop() succeeded on truncated property");
diff --git a/tests/truncated_string.c b/tests/truncated_string.c
index 5365f69..63214d2 100644
--- a/tests/truncated_string.c
+++ b/tests/truncated_string.c
@@ -37,8 +37,6 @@ int main(int argc, char *argv[])
 
 	test_init(argc, argv);
 
-	vg_prepare_blob(fdt, fdt_totalsize(fdt));
-
 	off = fdt_first_property_offset(fdt, 0);
 	good = fdt_get_property_by_offset(fdt, off, NULL);
 
-- 
2.18.0