From c53f71b2ee16f38f009d5b5b1a1a6f310ee36fc7 Mon Sep 17 00:00:00 2001 From: Dmytro Prokopchuk1 Date: Wed, 12 Nov 2025 09:50:25 +0000 Subject: [PATCH] xen/arm: Use FDT_MAGIC from libfdt instead of local macro Remove the redundant local 'DTB_MAGIC' definition and replace its usage with the canonical 'FDT_MAGIC' from 'libfdt'. Amends: 66edeb2e3972 (arm: copy DTB appended to zImage) Signed-off-by: Dmytro Prokopchuk Reviewed-by: Luca Fancellu Acked-by: Julien Grall --- xen/arch/arm/kernel.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/xen/arch/arm/kernel.c b/xen/arch/arm/kernel.c index 48f4b56d0c..7544fd50a2 100644 --- a/xen/arch/arm/kernel.c +++ b/xen/arch/arm/kernel.c @@ -40,8 +40,6 @@ struct minimal_dtb_header { /* There are other fields but we don't use them yet. */ }; -#define DTB_MAGIC 0xd00dfeedU - static void __init place_modules(struct kernel_info *info, paddr_t kernbase, paddr_t kernend) { @@ -383,7 +381,7 @@ static int __init kernel_zimage32_probe(struct kernel_info *info, if ( addr + end - start + sizeof(dtb_hdr) <= size ) { copy_from_paddr(&dtb_hdr, addr + end - start, sizeof(dtb_hdr)); - if (be32_to_cpu(dtb_hdr.magic) == DTB_MAGIC) { + if (be32_to_cpu(dtb_hdr.magic) == FDT_MAGIC) { end += be32_to_cpu(dtb_hdr.total_size); if ( end > addr + size )