@@ -2872,7 +2873,7 @@ hwaddr arm_cpu_get_phys_page_attrs_debug(CPUState *cs,
vaddr addr,
.in_secure = arm_is_secure(env),
.in_debug = true,
};
- GetPhysAddrResult res = {};
+ GetPhysAddrResult res = { .f.attrs = MEMTXATTRS_CPU(cs) };
ARMMMUFaultInfo fi = {};
bool ret;
diff --git a/target/arm/tlb_helper.c b/target/arm/tlb_helper.c
index 0f4f4fc809..5960269421 100644
--- a/target/arm/tlb_helper.c
+++ b/target/arm/tlb_helper.c
@@ -208,7 +208,7 @@ bool arm_cpu_tlb_fill(CPUState *cs, vaddr address, int size,
bool probe, uintptr_t retaddr)
{
ARMCPU *cpu = ARM_CPU(cs);
- GetPhysAddrResult res = {};
+ GetPhysAddrResult res = { .f.attrs = MEMTXATTRS_CPU(cs) };