commit bd2fc0e099a19a8af300d36cb3d092b3919b3ca8
author Karl Meakin <karl.meakin@arm.com> Tue Nov 26 11:21:52 2024 +0000
committer Joao Alves <joao.alves@arm.com> Fri Dec 13 17:07:52 2024 +0100
tree 4087182df536f166bea3fe221fe3347d4002ddf8
parent fb761eb1498cc9f6b02065a2b206b67e93bbb87f

test: load-address-relative-offset integration tests

Change-Id: If93a68dddffc8b2581d9da332c22714e59bbd39f
Signed-off-by: Karl Meakin <karl.meakin@arm.com>

test/hftest/service_common.c

diff --git a/test/hftest/service_common.c b/test/hftest/service_common.c
index 2ec6e16..6ff2c71 100644
--- a/test/hftest/service_common.c
+++ b/test/hftest/service_common.c
@@ -7,12 +7,14 @@
  */
 
 #include "hf/check.h"
+#include "hf/fdt.h"
 #include "hf/fdt_handler.h"
 #include "hf/ffa.h"
 #include "hf/memiter.h"
 #include "hf/mm.h"
 #include "hf/std.h"
 #include "hf/stdout.h"
+#include "hf/string.h"
 
 #include "vmapi/hf/call.h"
 
@@ -109,6 +111,7 @@
 	struct string mem_region_node_name = STRING_INIT("memory-regions");
 	struct string dev_region_node_name = STRING_INIT("device-regions");
 	struct memiter uuid;
+	struct memiter description;
 	uint32_t uuid_word = 0;
 	uint16_t j = 0;
 	uint16_t i = 0;
@@ -177,6 +180,14 @@
 				cur_region->base_address =
 					ctx->partition_manifest.load_addr +
 					number;
+				cur_region->is_relative = true;
+			}
+
+			if (fdt_read_property(&ffa_node, "description",
+					      &description)) {
+				EXPECT_EQ(string_init(&cur_region->description,
+						      &description),
+					  STRING_SUCCESS);
 			}
 
 			EXPECT_TRUE(fdt_read_number(&ffa_node, "attributes",