Rename shutdown() to power_off() to avoid conflicts with libc for tests.
Change-Id: I1b8a61ad93294d296d711ff8a2f2c2c597b991e3
diff --git a/src/arch/aarch64/hftest/entry.S b/src/arch/aarch64/hftest/entry.S
index d7542e3..04babae 100644
--- a/src/arch/aarch64/hftest/entry.S
+++ b/src/arch/aarch64/hftest/entry.S
@@ -25,7 +25,7 @@
bl kmain
/* If the VM returns, shutdown the system. */
- bl shutdown
+ bl arch_power_off
/* Loop forever waiting for interrupts. */
0: wfi
diff --git a/src/arch/aarch64/hftest/power_mgmt.c b/src/arch/aarch64/hftest/power_mgmt.c
index a1c1801..f4edbf0 100644
--- a/src/arch/aarch64/hftest/power_mgmt.c
+++ b/src/arch/aarch64/hftest/power_mgmt.c
@@ -99,7 +99,7 @@
/**
* Shuts down the system or exits emulation.
*/
-noreturn void shutdown(void)
+noreturn void arch_power_off(void)
{
smc(PSCI_SYSTEM_OFF, 0, 0, 0);
for (;;) {
diff --git a/src/arch/aarch64/inc/hf/arch/vm/power_mgmt.h b/src/arch/aarch64/inc/hf/arch/vm/power_mgmt.h
index 7128b06..748e42c 100644
--- a/src/arch/aarch64/inc/hf/arch/vm/power_mgmt.h
+++ b/src/arch/aarch64/inc/hf/arch/vm/power_mgmt.h
@@ -21,7 +21,7 @@
#include <stdint.h>
#include <stdnoreturn.h>
-noreturn void shutdown(void);
+noreturn void arch_power_off(void);
bool cpu_start(uintptr_t id, void *stack, size_t stack_size,
void (*entry)(uintptr_t arg), uintptr_t arg);
diff --git a/test/hftest/hftest.c b/test/hftest/hftest.c
index 1016a9a..1193407 100644
--- a/test/hftest/hftest.c
+++ b/test/hftest/hftest.c
@@ -93,7 +93,7 @@
static noreturn void abort(void)
{
HFTEST_LOG("FAIL");
- shutdown();
+ arch_power_off();
}
static void run_test(hftest_test_fn set_up, hftest_test_fn test,