]> xenbits.xensource.com Git - xen.git/commit
bootfdt: Add missing trailing commas in BOOTINFO_{ACPI,SHMEM}_INIT
authorMichal Orzel <michal.orzel@amd.com>
Tue, 3 Dec 2024 09:22:14 +0000 (10:22 +0100)
committerAndrew Cooper <andrew.cooper3@citrix.com>
Tue, 3 Dec 2024 12:20:41 +0000 (12:20 +0000)
commit5a455a52eae1420619df14c8e55fd17ced70538e
tree2876144159107e8e9df4dd6661a4088a07557ea0
parent28301682f492c1df2ff9c3e01a0aab6262bd925a
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@amd.com>
Reviewed-by: Bertrand Marquis <bertrand.marquis@arm.com>
Reviewed-by: Luca Fancellu <luca.fancellu@arm.com>
xen/include/xen/bootfdt.h