[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v6 08/11] xen/arm: gate make_gicv3_domU_node with CONFIG_GICV3
- To: <xen-devel@xxxxxxxxxxxxxxxxxxxx>, <sstabellini@xxxxxxxxxx>, <julien@xxxxxxx>
- From: Penny Zheng <penny.zheng@xxxxxxx>
- Date: Mon, 14 Feb 2022 03:19:53 +0000
- Arc-authentication-results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 40.67.248.234) smtp.rcpttodomain=lists.xenproject.org smtp.mailfrom=arm.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=arm.com; dkim=none (message not signed); arc=none
- Arc-message-signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=imow8UlbEMwA9qvqpckFhNwsAsfpDkhGSm02fiqstow=; b=DvPJaEMq5U/8pL4EAQqdqQuLCPTHBt5+XXTXA5HdKHH5jUL8anM7hHO9tMM4OgN8WGQaFemRmFKUqanMMOPYiTbB3LMMWrsDsVs/nPuw4y2Px90Y6RVDpCVCt0G4ksMDYzzUonkl2/I0HlTRXtlwwVgSDuzXSbUctPuS/2QS0KtUbzszy4XnTBTO+02zRyKDi9CdKSyPy5uRW24smnZLMnlpW2ECJo+m9MfLP5YW/DSWZUqVfFNVdNYdFcWgZFxq7n5G/6Hmo+Xwo4ld586r0Xf3BsmXx0nITLtL7T8iqM7J27B3eP8nzprVltpmdpLa9Z00AH3PfFK6dbmTwjeDeQ==
- Arc-seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TYi6Wz4nOK7GaP0/DV/GVLvprPQ37wn8jHnE6MTK7Qx2KAuWKPqTFLy4z4uNNiZqd3c99Owt3/N15vSOH8oSBU+4UPnosg+P1AlLY/cHe++/UJextnR9Rjn1bQV2u3SktdY0Ie35vjr5HbQOqzRElUkvlbSrObzrSVo5x23j79/B9izwqKvu78sARLpS4h6tVU335mhakWU5TgJnZk0l/oSttXpDdvYPaIbJrjVvQ5Q8u3ip8yOIapkNMTIFQyg5fPNG+Cxq6FvM7wJxGAf/5ByQhST741blShnx92OmMGAm8nomtb4FQELi3kx5RHp4bbCBVSFNZ+aoPRFXr3vAVw==
- Cc: <Bertrand.Marquis@xxxxxxx>, <Wei.Chen@xxxxxxx>
- Delivery-date: Mon, 14 Feb 2022 03:21:36 +0000
- List-id: Xen developer discussion <xen-devel.lists.xenproject.org>
- Nodisclaimer: true
This commit gates function make_gicv3_domU_node with CONFIG_GICV3.
Signed-off-by: Penny Zheng <penny.zheng@xxxxxxx>
Acked-by: Stefano Stabellini <sstabellini@xxxxxxxxxx>
Tested-by: Stefano Stabellini <sstabellini@xxxxxxxxxx>
---
v4 changes:
- remove ASSERT_UNREACHABLE() to avoid breaking compilation on prod build with
CONFIG_GICV3=n
---
v5 changes:
- nothing changed
---
v6 changes:
- nothing changed
---
xen/arch/arm/domain_build.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c
index 87391adde6..a01dc60b55 100644
--- a/xen/arch/arm/domain_build.c
+++ b/xen/arch/arm/domain_build.c
@@ -2322,6 +2322,7 @@ static int __init make_gicv2_domU_node(struct kernel_info
*kinfo)
return res;
}
+#ifdef CONFIG_GICV3
static int __init make_gicv3_domU_node(struct kernel_info *kinfo)
{
void *fdt = kinfo->fdt;
@@ -2371,13 +2372,16 @@ static int __init make_gicv3_domU_node(struct
kernel_info *kinfo)
return res;
}
+#endif
static int __init make_gic_domU_node(struct kernel_info *kinfo)
{
switch ( kinfo->d->arch.vgic.version )
{
+#ifdef CONFIG_GICV3
case GIC_V3:
return make_gicv3_domU_node(kinfo);
+#endif
case GIC_V2:
return make_gicv2_domU_node(kinfo);
default:
--
2.25.1
|