* Sean Christopherson <seanjc@xxxxxxxxxx> wrote: > On Tue, May 06, 2025, Juergen Gross wrote: > > Avoid a name clash with a new general MSR access helper after a future > > MSR infrastructure rework by renaming the KVM specific read_msr() to > > kvm_read_msr(). > > > > Signed-off-by: Juergen Gross <jgross@xxxxxxxx> > > --- > > arch/x86/include/asm/kvm_host.h | 2 +- > > arch/x86/kvm/vmx/vmx.c | 4 ++-- > > 2 files changed, 3 insertions(+), 3 deletions(-) > > > > diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h > > index 9c971f846108..308f7020dc9d 100644 > > --- a/arch/x86/include/asm/kvm_host.h > > +++ b/arch/x86/include/asm/kvm_host.h > > @@ -2275,7 +2275,7 @@ static inline void kvm_load_ldt(u16 sel) > > } > > > > #ifdef CONFIG_X86_64 > > -static inline unsigned long read_msr(unsigned long msr) > > Ewwww. Eww, eww, eww. I forgot this thing existed. > > Please just delete this and use rdmsrq() directly (or is it still rdmsrl()? at > this point?). Both will work, so code-in-transition isn't build-broken unnecessarily: arch/x86/include/asm/msr.h:#define rdmsrl(msr, val) rdmsrq(msr, val) :-) Thanks, Ingo
