Hi all, After merging the kvm tree, today's linux-next build (x86_64 allmodconfig) failed like this: arch/x86/kvm/vmx/main.c:102:43: error: 'pi_has_pending_interrupt' undeclared here (not in a function) 102 | .dy_apicv_has_pending_interrupt = pi_has_pending_interrupt, | ^~~~~~~~~~~~~~~~~~~~~~~~ arch/x86/kvm/vmx/main.c:131:27: error: 'vmx_pi_update_irte' undeclared here (not in a function); did you mean 'kvm_apic_update_irr'? 131 | .pi_update_irte = vmx_pi_update_irte, | ^~~~~~~~~~~~~~~~~~ | kvm_apic_update_irr arch/x86/kvm/vmx/main.c:132:32: error: 'vmx_pi_start_assignment' undeclared here (not in a function); did you mean 'kvm_arch_start_assignment'? 132 | .pi_start_assignment = vmx_pi_start_assignment, | ^~~~~~~~~~~~~~~~~~~~~~~ | kvm_arch_start_assignment Probably caused by commit 5f18c642ff7e ("KVM: VMX: Move out vmx_x86_ops to 'main.c' to dispatch VMX and TDX") interacting with commit 699f67512f04 ("KVM: VMX: Move posted interrupt descriptor out of VMX code") from the tip tree. I have applied the following merge resolution patch. From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> Date: Thu, 2 May 2024 14:13:25 +1000 Subject: [PATCH] fixup for "KVM: VMX: Move posted interrupt descriptor out of VMX code" interacting with commit 5f18c642ff7e ("KVM: VMX: Move out vmx_x86_ops to 'main.c' to dispatch VMX andTDX") Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> --- arch/x86/kvm/vmx/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/x86/kvm/vmx/main.c b/arch/x86/kvm/vmx/main.c index 7c546ad3e4c9..d4ed681785fd 100644 --- a/arch/x86/kvm/vmx/main.c +++ b/arch/x86/kvm/vmx/main.c @@ -5,6 +5,7 @@ #include "vmx.h" #include "nested.h" #include "pmu.h" +#include "posted_intr.h" #define VMX_REQUIRED_APICV_INHIBITS \ (BIT(APICV_INHIBIT_REASON_DISABLE)| \ -- 2.43.0 -- Cheers, Stephen Rothwell
Attachment:
pgpQSNOftN0Ca.pgp
Description: OpenPGP digital signature