[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH] bootfdt: Add missing trailing commas in BOOTINFO_{ACPI,SHMEM}_INIT
- To: Michal Orzel <michal.orzel@xxxxxxx>
- From: Bertrand Marquis <Bertrand.Marquis@xxxxxxx>
- Date: Tue, 3 Dec 2024 09:24:00 +0000
- Accept-language: en-GB, en-US
- Arc-authentication-results: i=2; mx.microsoft.com 1; spf=pass (sender ip is 63.35.35.123) smtp.rcpttodomain=lists.xenproject.org smtp.mailfrom=arm.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=arm.com; dkim=pass (signature was verified) header.d=arm.com; arc=pass (0 oda=1 ltdi=1 spf=[1,1,smtp.mailfrom=arm.com] dkim=[1,1,header.d=arm.com] dmarc=[1,1,header.from=arm.com])
- Arc-authentication-results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=arm.com; dmarc=pass action=none header.from=arm.com; dkim=pass header.d=arm.com; arc=none
- Arc-message-signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=f6XyTv27PWT0FkuwHgF5iVQqnoDihYutOn6vnsjZDgs=; b=Ru12QLpbzqLYxo/3rGYtmGasq8oYdbgdel07CMUxCsCE0VWrQQxrSsMMk/jyXpFm/2Pz9m2psSyEQvawVdSwjT3hAou/xDcvSZg9Wcz+rx0mLHGD+7jfcuZlOS8z237a7WWaXoho2grXur0+tJAOy92gx4ZdVwYMljfj6DXVnjNGdvlBT96PH2AoXuRFT2lI4OAshI/oQ7GqeJLH1sZjAi2ZKjKZlcCs6axgacsw1BmhPbCu7BKfbxjpRNMQjkuz41hubqkkyF8qzFbNcGwhxwx0ETeINHLAQDuzdqYt564jrJ4bxXQOlky646cilKrfMQW+wUu4Dr3BTUqyTUlhNA==
- Arc-message-signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=f6XyTv27PWT0FkuwHgF5iVQqnoDihYutOn6vnsjZDgs=; b=Q284QzLH6Bcqd4ZL17UuAH2q6cosF4BnGakkfnZGloCmYIAK2138ueOFSL9klf6KaZNpxjgeOUhkdrbQy0eFEJwwKhlzW9yI2KRk20vfYDv5Gd+Nf89NKKMjStB9CnLn1V3y8ZI3aHdlJoLPXMhFwHMpuL7z90QNPmOMa1/fuQaRCFtlLb9HD/JxNTSMws+WAqeCR+rROBVNmQQMPxUwRxVjl9vBGBPBxXl3sx5xn474tD2sZ3cM4ZR1CAlK6kRnJRH8g1DE5TXX57THlDubtU+xsBegAwr98SjzAsvB7DVj4u7U2AP/DTw0VzT/L/4jm2ce6lk1B8E39ulk7v/MOA==
- Arc-seal: i=2; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=pass; b=SBbWMrn9u2hONENxX2RoxuJ4CkfAw/1WAeAzQ/Mez1+ppKhO+ooDPMn3np58KB0QUYvbuO5YHzwovjD2U8Egz/FqEde6Uj57z2ET5EZEa6vm7UpTsADid2d8dRx2aY7HobpXYw0vfNCsNz4RyYv57yLJRZ4KpxUkPhUP/+6J2KZ2ZH06qmje0ZLjMuheu10lasEMe9T79Dtn5qeMLr3wOO3RbIcnTTsZhgTQ2NtUuw+k8Uzz8Ui1qEfiV2n8MNX2JEh4MRZE5BcpM6u4t3x+OcGa/z16trmVrQcL4oEnVD+wP8+dSp1ET/xm/MpQ/4M8WLc2SgvFQa18Ggx+Q4iINQ==
- Arc-seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=xt9wVcJVPY9+xo4588RFbO9CnfyLfGb2ZKzzdd/9H19j5eMWULFSHGO6ReIUP9W0QKJZpuwl932jwfyK4fkg2THxUkOVbsodkBV+6+ITEltQOeylcC9hsnOX54ODo30YYfg5IKD3uDR9+gZ+xCw45FieYM7eyVcG8UZ2nG05eCfQkViYEt9PvmxQjFP7S4oqJIqCD9UfBz1BS4QeBmcr14SqkgXGdkz5malSkX2u3jy3dlF7sqqbiielGrw2Xx//CLX/iUgCAxS1ZyyKiPKosUPWNEtmRYktf0+V5Bztpiy29Sf6wwj1ZxwJ4vc6x469Xg5aU8lAUYLQqZZ9/mmF/g==
- Authentication-results-original: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com;
- Cc: "xen-devel@xxxxxxxxxxxxxxxxxxxx" <xen-devel@xxxxxxxxxxxxxxxxxxxx>, Stefano Stabellini <sstabellini@xxxxxxxxxx>, Julien Grall <julien@xxxxxxx>
- Delivery-date: Tue, 03 Dec 2024 09:24:19 +0000
- List-id: Xen developer discussion <xen-devel.lists.xenproject.org>
- Nodisclaimer: true
- Original-authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com;
- Thread-index: AQHbRWTfGBof/YMyMU6ZlfcGMKQsgLLUP1YA
- Thread-topic: [PATCH] bootfdt: Add missing trailing commas in BOOTINFO_{ACPI,SHMEM}_INIT
Hi Michal,
> On 3 Dec 2024, at 10:22, Michal Orzel <michal.orzel@xxxxxxx> wrote:
>
> 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>
Cheers
Bertrand
> ---
> 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 cea40ee11706..343c48b73d2c 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
> --
> 2.25.1
>
|
