Andrew Geissler | fc7e797 | 2023-09-11 08:24:07 -0400 | [diff] [blame^] | 1 | From 960d022fa69568752a58b6f5d78e9759b54cff68 Mon Sep 17 00:00:00 2001 |
Patrick Williams | 8dd6848 | 2022-10-04 07:57:18 -0500 | [diff] [blame] | 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Thu, 22 Sep 2022 19:13:49 -0700 |
| 4 | Subject: [PATCH] Fix build with clang-15 |
| 5 | |
| 6 | Clang-15 warns about prototypes a bit harder |
| 7 | Remove unused variable suites_in_image |
| 8 | |
| 9 | Upstream-Status: Pending |
| 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
Patrick Williams | 8dd6848 | 2022-10-04 07:57:18 -0500 | [diff] [blame] | 11 | --- |
| 12 | test/hftest/common.c | 2 -- |
Patrick Williams | 8dd6848 | 2022-10-04 07:57:18 -0500 | [diff] [blame] | 13 | test/vmapi/arch/aarch64/gicv3/inc/gicv3.h | 2 +- |
| 14 | test/vmapi/arch/aarch64/gicv3/timer_secondary.c | 2 +- |
| 15 | test/vmapi/el0_partitions/services/interruptible.c | 2 +- |
| 16 | test/vmapi/el0_partitions/services/interruptible_echo.c | 2 +- |
| 17 | test/vmapi/primary_with_secondaries/services/interruptible.c | 2 +- |
Andrew Geissler | fc7e797 | 2023-09-11 08:24:07 -0400 | [diff] [blame^] | 18 | 6 files changed, 5 insertions(+), 7 deletions(-) |
Patrick Williams | 8dd6848 | 2022-10-04 07:57:18 -0500 | [diff] [blame] | 19 | |
| 20 | diff --git a/test/hftest/common.c b/test/hftest/common.c |
Andrew Geissler | fc7e797 | 2023-09-11 08:24:07 -0400 | [diff] [blame^] | 21 | index 344ff2452c36..175230a7cfa7 100644 |
Patrick Williams | 8dd6848 | 2022-10-04 07:57:18 -0500 | [diff] [blame] | 22 | --- a/test/hftest/common.c |
| 23 | +++ b/test/hftest/common.c |
| 24 | @@ -67,7 +67,6 @@ void hftest_json(void) |
| 25 | { |
| 26 | const char *suite = NULL; |
| 27 | size_t i; |
| 28 | - size_t suites_in_image = 0; |
| 29 | size_t tests_in_suite = 0; |
| 30 | |
| 31 | HFTEST_LOG("{"); |
| 32 | @@ -81,7 +80,6 @@ void hftest_json(void) |
| 33 | HFTEST_LOG(" },"); |
| 34 | } |
| 35 | /* Move onto new suite. */ |
| 36 | - ++suites_in_image; |
| 37 | suite = test->suite; |
| 38 | tests_in_suite = 0; |
| 39 | HFTEST_LOG(" {"); |
Patrick Williams | 8dd6848 | 2022-10-04 07:57:18 -0500 | [diff] [blame] | 40 | diff --git a/test/vmapi/arch/aarch64/gicv3/inc/gicv3.h b/test/vmapi/arch/aarch64/gicv3/inc/gicv3.h |
Andrew Geissler | fc7e797 | 2023-09-11 08:24:07 -0400 | [diff] [blame^] | 41 | index 28bf29d412f4..dede047a381a 100644 |
Patrick Williams | 8dd6848 | 2022-10-04 07:57:18 -0500 | [diff] [blame] | 42 | --- a/test/vmapi/arch/aarch64/gicv3/inc/gicv3.h |
| 43 | +++ b/test/vmapi/arch/aarch64/gicv3/inc/gicv3.h |
| 44 | @@ -30,4 +30,4 @@ extern void *recv_buffer; |
| 45 | |
| 46 | extern volatile uint32_t last_interrupt_id; |
| 47 | |
Andrew Geissler | fc7e797 | 2023-09-11 08:24:07 -0400 | [diff] [blame^] | 48 | -void gicv3_system_setup(); |
| 49 | +void gicv3_system_setup(void); |
Patrick Williams | 8dd6848 | 2022-10-04 07:57:18 -0500 | [diff] [blame] | 50 | diff --git a/test/vmapi/arch/aarch64/gicv3/timer_secondary.c b/test/vmapi/arch/aarch64/gicv3/timer_secondary.c |
Andrew Geissler | fc7e797 | 2023-09-11 08:24:07 -0400 | [diff] [blame^] | 51 | index 0ac07f4411df..6264a5864721 100644 |
Patrick Williams | 8dd6848 | 2022-10-04 07:57:18 -0500 | [diff] [blame] | 52 | --- a/test/vmapi/arch/aarch64/gicv3/timer_secondary.c |
| 53 | +++ b/test/vmapi/arch/aarch64/gicv3/timer_secondary.c |
| 54 | @@ -55,7 +55,7 @@ TEAR_DOWN(timer_secondary_ffa) |
| 55 | EXPECT_FFA_ERROR(ffa_rx_release(), FFA_DENIED); |
| 56 | } |
| 57 | |
| 58 | -static void timer_busywait_secondary() |
| 59 | +static void timer_busywait_secondary(void) |
| 60 | { |
| 61 | const char message[] = "loop 0099999"; |
| 62 | const char expected_response[] = "Got IRQ 03."; |
| 63 | diff --git a/test/vmapi/el0_partitions/services/interruptible.c b/test/vmapi/el0_partitions/services/interruptible.c |
Andrew Geissler | fc7e797 | 2023-09-11 08:24:07 -0400 | [diff] [blame^] | 64 | index 85c97dc7a857..80fc61b2e5a9 100644 |
Patrick Williams | 8dd6848 | 2022-10-04 07:57:18 -0500 | [diff] [blame] | 65 | --- a/test/vmapi/el0_partitions/services/interruptible.c |
| 66 | +++ b/test/vmapi/el0_partitions/services/interruptible.c |
Andrew Geissler | fc7e797 | 2023-09-11 08:24:07 -0400 | [diff] [blame^] | 67 | @@ -44,7 +44,7 @@ static void irq(void) |
Patrick Williams | 8dd6848 | 2022-10-04 07:57:18 -0500 | [diff] [blame] | 68 | * Try to receive a message from the mailbox, blocking if necessary, and |
| 69 | * retrying if interrupted. |
| 70 | */ |
| 71 | -static struct ffa_value mailbox_receive_retry() |
| 72 | +static struct ffa_value mailbox_receive_retry(void) |
| 73 | { |
| 74 | struct ffa_value received; |
| 75 | |
| 76 | diff --git a/test/vmapi/el0_partitions/services/interruptible_echo.c b/test/vmapi/el0_partitions/services/interruptible_echo.c |
Andrew Geissler | fc7e797 | 2023-09-11 08:24:07 -0400 | [diff] [blame^] | 77 | index 958d75090cce..55511d6a2bce 100644 |
Patrick Williams | 8dd6848 | 2022-10-04 07:57:18 -0500 | [diff] [blame] | 78 | --- a/test/vmapi/el0_partitions/services/interruptible_echo.c |
| 79 | +++ b/test/vmapi/el0_partitions/services/interruptible_echo.c |
Andrew Geissler | fc7e797 | 2023-09-11 08:24:07 -0400 | [diff] [blame^] | 80 | @@ -33,7 +33,7 @@ static void irq(void) |
Patrick Williams | 8dd6848 | 2022-10-04 07:57:18 -0500 | [diff] [blame] | 81 | * Try to receive a message from the mailbox, blocking if necessary, and |
| 82 | * retrying if interrupted. |
| 83 | */ |
| 84 | -static struct ffa_value mailbox_receive_retry() |
| 85 | +static struct ffa_value mailbox_receive_retry(void) |
| 86 | { |
| 87 | struct ffa_value received; |
| 88 | |
| 89 | diff --git a/test/vmapi/primary_with_secondaries/services/interruptible.c b/test/vmapi/primary_with_secondaries/services/interruptible.c |
Andrew Geissler | fc7e797 | 2023-09-11 08:24:07 -0400 | [diff] [blame^] | 90 | index 594f28ac8bc8..3888bf8b0b6e 100644 |
Patrick Williams | 8dd6848 | 2022-10-04 07:57:18 -0500 | [diff] [blame] | 91 | --- a/test/vmapi/primary_with_secondaries/services/interruptible.c |
| 92 | +++ b/test/vmapi/primary_with_secondaries/services/interruptible.c |
Andrew Geissler | fc7e797 | 2023-09-11 08:24:07 -0400 | [diff] [blame^] | 93 | @@ -41,7 +41,7 @@ static void irq(void) |
Patrick Williams | 8dd6848 | 2022-10-04 07:57:18 -0500 | [diff] [blame] | 94 | * Try to receive a message from the mailbox, blocking if necessary, and |
| 95 | * retrying if interrupted. |
| 96 | */ |
| 97 | -struct ffa_value mailbox_receive_retry() |
| 98 | +struct ffa_value mailbox_receive_retry(void) |
| 99 | { |
| 100 | struct ffa_value received; |
| 101 | |