Commit 70180052 authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

KVM: x86: Make kvm_lapic_reg_{read,write}() static 



Make the low level read/write lapic helpers static, any accesses to the
local APIC from vendor code or non-APIC code should be routed through
proper helpers.

No functional change intended.

Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Message-Id: <20220204214205.3306634-8-seanjc@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent bd17f417

arch/x86/kvm/lapic.c

+3 −5
Original line number Diff line number Diff line
@@ -1378,7 +1378,7 @@ static inline struct kvm_lapic *to_lapic(struct kvm_io_device *dev) 
#define APIC_REGS_MASK(first, count) \

	(APIC_REG_MASK(first) * ((1ull << (count)) - 1))



int kvm_lapic_reg_read(struct kvm_lapic *apic, u32 offset, int len,

static int kvm_lapic_reg_read(struct kvm_lapic *apic, u32 offset, int len,

			      void *data)

{

	unsigned char alignment = offset & 0xf;
@@ -1435,7 +1435,6 @@ int kvm_lapic_reg_read(struct kvm_lapic *apic, u32 offset, int len, 
	}

	return 0;

}

EXPORT_SYMBOL_GPL(kvm_lapic_reg_read);



static int apic_mmio_in_range(struct kvm_lapic *apic, gpa_t addr)

{
@@ -1996,7 +1995,7 @@ static void apic_manage_nmi_watchdog(struct kvm_lapic *apic, u32 lvt0_val) 
	}

}



int kvm_lapic_reg_write(struct kvm_lapic *apic, u32 reg, u32 val)

static int kvm_lapic_reg_write(struct kvm_lapic *apic, u32 reg, u32 val)

{

	int ret = 0;
@@ -2143,7 +2142,6 @@ int kvm_lapic_reg_write(struct kvm_lapic *apic, u32 reg, u32 val) 


	return ret;

}

EXPORT_SYMBOL_GPL(kvm_lapic_reg_write);



static int apic_mmio_write(struct kvm_vcpu *vcpu, struct kvm_io_device *this,

			    gpa_t address, int len, const void *data)

arch/x86/kvm/lapic.h

+0 −3
Original line number Diff line number Diff line
@@ -85,9 +85,6 @@ void kvm_lapic_set_base(struct kvm_vcpu *vcpu, u64 value); 
u64 kvm_lapic_get_base(struct kvm_vcpu *vcpu);

void kvm_recalculate_apic_map(struct kvm *kvm);

void kvm_apic_set_version(struct kvm_vcpu *vcpu);

int kvm_lapic_reg_write(struct kvm_lapic *apic, u32 reg, u32 val);

int kvm_lapic_reg_read(struct kvm_lapic *apic, u32 offset, int len,

		       void *data);

bool kvm_apic_match_dest(struct kvm_vcpu *vcpu, struct kvm_lapic *source,

			   int shorthand, unsigned int dest, int dest_mode);

int kvm_apic_compare_prio(struct kvm_vcpu *vcpu1, struct kvm_vcpu *vcpu2);