[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v1] xen/x86: move monitor.o out of PV_SHIM_EXCLUSIVE condition
- To: <xen-devel@xxxxxxxxxxxxxxxxxxxx>
- From: Penny Zheng <Penny.Zheng@xxxxxxx>
- Date: Wed, 23 Jul 2025 14:52:06 +0800
- Arc-authentication-results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.xenproject.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0)
- 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=gB4uJjh2n1Vd5KQstRkQVBQiyrYFfwdIF6rOlkiPSKo=; b=vUSKid9bvnpUCRPLINyimkVIhEDVeLY85Rfgm98rkxrX8yOulWCAjaBlGTyAh7uY6vrmieZ1eaV8xSaXwvPZMiV1PT+oFyOYPJxHZJgPPPlnyGV9YntxXFP4xf/A/TQ5mlUJDzAQ8+5judTpOX5gzkWF74L9IuIWLKjmYmP+2KyJAuAqVASeCmv0fLn+nG8QMgrM56LYJWYOjr6sIDJaJt4ndlqih9wKUOMQthlDSanwQ/xD5CJGhjEPXRsvrU2OWpReneCqzTIilvQC3zKvcLk0pzE4ouOjf43f/EuCWWTpOvyEqWFjKPwvf6AIGGY0PJVLnS5LIE0PsZ/Qp0YyZA==
- Arc-seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=T3IXC8+3dKd0MwFD9TS7POYwrBV9SOvIMKkvB+b7fYQYpsE9GFz+rNhVw/aF21UlM+nIw604x0LwtNruj03xbL4rC9nGWkRnZe+NOKqW2XCrB0ZtZfDS2pVFf5KQWCkDqGhrGuPeDMU+HCoqAv2r9omd4m7l/1xo0exFAJDYTO8cW3v1Ga1yqb9BVGt8f3d25177CwVJ7TCLnsRtA/l9XhijwbFbl9dFN96dNoBW96VbCwakyuUAeyBYGAtGFUl3a2+3yZxytPL6L8sl2SEDgzHc+VenZQvcootmlbxuysRUp7wetlXsTKfVBxDAmjrWPq1K6QgVWjyZuULPHSBZxQ==
- Cc: <ray.huang@xxxxxxx>, Penny Zheng <Penny.Zheng@xxxxxxx>, Andrew Cooper <andrew.cooper3@xxxxxxxxxx>, Anthony PERARD <anthony.perard@xxxxxxxxxx>, Michal Orzel <michal.orzel@xxxxxxx>, Jan Beulich <jbeulich@xxxxxxxx>, "Julien Grall" <julien@xxxxxxx>, Roger Pau Monné <roger.pau@xxxxxxxxxx>, Stefano Stabellini <sstabellini@xxxxxxxxxx>
- Delivery-date: Wed, 23 Jul 2025 06:52:45 +0000
- List-id: Xen developer discussion <xen-devel.lists.xenproject.org>
Since we move "!PV_SHIM_EXCLUSIVE" dependency from CONFIG_HVM, there is
a chance that a randconfig picking both PV_SHIM_EXCLUSIVE=y and HVM=y results
in hvm.c being built, but monitor.c not being built, which leaves
functions like monitor_traps(), etc, undefined, causing linking to fail.
So we move monitor.o out of PV_SHIM_EXCLUSIVE condition to fix above linking
failure.
Fixes: 568f806cba4c ("xen/x86: remove "depends on !PV_SHIM_EXCLUSIVE"")
Reported-by: Jan Beulich <jbeulich@xxxxxxxx>
Signed-off-by: Penny Zheng <Penny.Zheng@xxxxxxx>
---
xen/common/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/xen/common/Makefile b/xen/common/Makefile
index 8dce771970..c316957fcb 100644
--- a/xen/common/Makefile
+++ b/xen/common/Makefile
@@ -28,6 +28,7 @@ obj-$(CONFIG_LIVEPATCH) += livepatch.o livepatch_elf.o
obj-$(CONFIG_LLC_COLORING) += llc-coloring.o
obj-$(CONFIG_VM_EVENT) += mem_access.o
obj-y += memory.o
+obj-$(CONFIG_VM_EVENT) += monitor.o
obj-y += multicall.o
obj-y += notifier.o
obj-$(CONFIG_NUMA) += numa.o
@@ -70,7 +71,6 @@ obj-$(CONFIG_COMPAT) += $(addprefix compat/,domain.o memory.o
multicall.o xlat.o
ifneq ($(CONFIG_PV_SHIM_EXCLUSIVE),y)
obj-y += domctl.o
-obj-$(CONFIG_VM_EVENT) += monitor.o
endif
extra-y := symbols-dummy.o
--
2.34.1
|
