From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Paolo Bonzini <pbonzini@redhat.com>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>
Cc: Jacob Pan <jacob.jun.pan@linux.intel.com>,
Isaku Yamahata <isaku.yamahata@intel.com>,
Sean Christopherson <seanjc@google.com>,
Xiaoyao Li <xiaoyao.li@intel.com>, KVM <kvm@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: build failure after merge of the kvm tree
Date: Thu, 2 May 2024 16:47:11 +1000 [thread overview]
Message-ID: <20240502164711.06b5aca6@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 2136 bytes --]
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@canb.auug.org.au>
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@canb.auug.org.au>
---
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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2024-05-02 6:47 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-02 6:47 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-04-12 3:34 linux-next: build failure after merge of the kvm tree Stephen Rothwell
2024-04-12 3:35 ` Stephen Rothwell
2024-04-12 12:14 ` Paolo Bonzini
2023-11-22 2:14 Stephen Rothwell
2023-11-20 4:22 Stephen Rothwell
2023-12-11 2:50 ` Stephen Rothwell
2022-04-19 5:34 Stephen Rothwell
2022-04-19 16:01 ` Sean Christopherson
2022-04-19 16:09 ` Paolo Bonzini
2022-04-21 18:06 ` Paolo Bonzini
2022-04-27 3:23 ` Stephen Rothwell
2022-04-27 6:06 ` Paolo Bonzini
2021-02-08 5:33 Stephen Rothwell
2021-02-08 11:18 ` Yu Zhang
2021-02-05 5:02 Stephen Rothwell
2021-02-05 10:08 ` Paolo Bonzini
2021-02-07 19:48 ` Stephen Rothwell
2021-02-09 4:56 ` Stephen Rothwell
2020-07-17 5:57 Stephen Rothwell
2020-07-29 7:06 ` Stephen Rothwell
2020-05-21 6:28 Stephen Rothwell
2020-06-04 2:54 ` Stephen Rothwell
2019-02-18 3:42 Stephen Rothwell
2019-02-19 15:36 ` Sean Christopherson
2019-02-19 18:17 ` Paolo Bonzini
2018-12-19 4:33 Stephen Rothwell
2017-02-08 3:23 Stephen Rothwell
2016-12-19 1:11 Stephen Rothwell
2015-09-08 1:35 Stephen Rothwell
2015-09-08 2:10 ` Wanpeng Li
2015-09-08 9:24 ` Paolo Bonzini
2015-05-29 7:36 Stephen Rothwell
2015-05-29 7:54 ` Ingo Molnar
2015-05-29 12:08 ` Paolo Bonzini
2014-11-24 6:19 Stephen Rothwell
2014-11-24 9:38 ` Paolo Bonzini
2014-08-06 4:39 Stephen Rothwell
2014-03-11 23:55 Mark Brown
2014-01-10 3:00 Stephen Rothwell
2014-01-17 4:03 ` Stephen Rothwell
2012-08-23 3:21 Stephen Rothwell
2012-03-06 4:53 Stephen Rothwell
2012-03-06 10:34 ` Avi Kivity
2010-08-30 1:35 Stephen Rothwell
2010-08-30 10:03 ` Alexander Graf
2010-08-30 10:56 ` Avi Kivity
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240502164711.06b5aca6@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=hpa@zytor.com \
--cc=isaku.yamahata@intel.com \
--cc=jacob.jun.pan@linux.intel.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peterz@infradead.org \
--cc=seanjc@google.com \
--cc=tglx@linutronix.de \
--cc=xiaoyao.li@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).