[xen staging] bootfdt: Add missing trailing commas in BOOTINFO_{ACPI,SHMEM}_INIT

[patchbot@xxxxxxx]

commit 5a455a52eae1420619df14c8e55fd17ced70538e
Author:     Michal Orzel <michal.orzel@xxxxxxx>
AuthorDate: Tue Dec 3 10:22:14 2024 +0100
Commit:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
CommitDate: Tue Dec 3 12:20:41 2024 +0000

    bootfdt: Add missing trailing commas in BOOTINFO_{ACPI,SHMEM}_INIT
    
    Commit a14593e3995a extended BOOTINFO_{ACPI,SHMEM}_INIT initializers
    list with a new 'type' member but forgot to add trailing commas (they
    were present before). This results in a build failure when building
    with CONFIG_ACPI=y and CONFIG_STATIC_SHM=y:
    ./include/xen/bootfdt.h:155:5: error: request for member 'shmem' in 
something not a structure or union
      155 |     .shmem.common.max_banks = NR_SHMEM_BANKS,       \
          |     ^
    ./include/xen/bootfdt.h:168:5: note: in expansion of macro 
'BOOTINFO_SHMEM_INIT'
      168 |     BOOTINFO_SHMEM_INIT                             \
          |     ^~~~~~~~~~~~~~~~~~~
    common/device-tree/bootinfo.c:22:39: note: in expansion of macro 
'BOOTINFO_INIT'
       22 | struct bootinfo __initdata bootinfo = BOOTINFO_INIT;
    
    Fixes: a14593e3995a ("xen/device-tree: Allow region overlapping with 
/memreserve/ ranges")
    Signed-off-by: Michal Orzel <michal.orzel@xxxxxxx>
    Reviewed-by: Bertrand Marquis <bertrand.marquis@xxxxxxx>
    Reviewed-by: Luca Fancellu <luca.fancellu@xxxxxxx>
---
 xen/include/xen/bootfdt.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xen/include/xen/bootfdt.h b/xen/include/xen/bootfdt.h
index cea40ee117..343c48b73d 100644
--- a/xen/include/xen/bootfdt.h
+++ b/xen/include/xen/bootfdt.h
@@ -145,7 +145,7 @@ struct bootinfo {
 #ifdef CONFIG_ACPI
 #define BOOTINFO_ACPI_INIT                          \
     .acpi.common.max_banks = NR_MEM_BANKS,          \
-    .acpi.common.type = MEMORY
+    .acpi.common.type = MEMORY,
 #else
 #define BOOTINFO_ACPI_INIT
 #endif
@@ -153,7 +153,7 @@ struct bootinfo {
 #ifdef CONFIG_STATIC_SHM
 #define BOOTINFO_SHMEM_INIT                         \
     .shmem.common.max_banks = NR_SHMEM_BANKS,       \
-    .shmem.common.type = STATIC_SHARED_MEMORY
+    .shmem.common.type = STATIC_SHARED_MEMORY,
 #else
 #define BOOTINFO_SHMEM_INIT
 #endif
--
generated by git-patchbot for /home/xen/git/xen.git#staging