From f8648a62466ca5da1bcd4d0c458f1add07949849 Mon Sep 17 00:00:00 2001 From: Daniel Rossier Date: Thu, 28 Aug 2025 12:57:02 +0200 Subject: [PATCH 1/3] Fix bad clang formating --- so3/avz/include/avz/domain.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/so3/avz/include/avz/domain.h b/so3/avz/include/avz/domain.h index 4ec7e705c..83bf338af 100644 --- a/so3/avz/include/avz/domain.h +++ b/so3/avz/include/avz/domain.h @@ -34,16 +34,16 @@ #ifdef __ASSEMBLY__ -.macro curdom rd, - tmp +.macro curdom rd, tmp - // Compute the address of the stack bottom where cpu_info is located. - ldr \rd, - = (~(DOMAIN_STACK_SIZE - 1)) mov \tmp, sp and \rd, \tmp, \rd + // Compute the address of the stack bottom where cpu_info is located. + ldr \rd, = (~(DOMAIN_STACK_SIZE - 1)) + mov \tmp, sp + and \rd, \tmp, \rd - // Get the address of the domain descriptor - ldr \rd, - [\rd].endm + // Get the address of the domain descriptor + ldr \rd, [\rd] +.endm #else /* __ASSEMBLY__ */ From fc6e63f81a60569ba6795e202944ca3f96911284 Mon Sep 17 00:00:00 2001 From: Daniel Rossier Date: Thu, 28 Aug 2025 15:20:16 +0200 Subject: [PATCH 2/3] Tell clang to ignore assembly code --- so3/avz/include/avz/domain.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/so3/avz/include/avz/domain.h b/so3/avz/include/avz/domain.h index 83bf338af..27e1ebd9e 100644 --- a/so3/avz/include/avz/domain.h +++ b/so3/avz/include/avz/domain.h @@ -34,6 +34,7 @@ #ifdef __ASSEMBLY__ +/* clang-format off */ .macro curdom rd, tmp // Compute the address of the stack bottom where cpu_info is located. @@ -44,6 +45,7 @@ // Get the address of the domain descriptor ldr \rd, [\rd] .endm +/* clang-format on */ #else /* __ASSEMBLY__ */ From 6077eb580d4aa7579fd27f57dbdf5f36b466415b Mon Sep 17 00:00:00 2001 From: Daniel Rossier Date: Thu, 28 Aug 2025 16:31:06 +0200 Subject: [PATCH 3/3] Fix bad dtb in its --- target/virt64_capsule.its | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/virt64_capsule.its b/target/virt64_capsule.its index 30a0ff85d..68340a8b7 100644 --- a/target/virt64_capsule.its +++ b/target/virt64_capsule.its @@ -36,7 +36,7 @@ fdt { description = "Flattened Device Tree blob"; - data = /incbin/("../so3/dts/virt64_guest.dtb"); + data = /incbin/("../so3/dts/virt64_capsule.dtb"); type = "flat_dt"; arch = "arm64"; compression = "none";