Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 52eb5a6d authored by Xiubo Li's avatar Xiubo Li Committed by Marcelo Tosatti
Browse files

KVM: x86: For the symbols used locally only should be static type 



This patch fix the following sparse warnings:

for arch/x86/kvm/x86.c:
warning: symbol 'emulator_read_write' was not declared. Should it be static?
warning: symbol 'emulator_write_emulated' was not declared. Should it be static?
warning: symbol 'emulator_get_dr' was not declared. Should it be static?
warning: symbol 'emulator_set_dr' was not declared. Should it be static?

for arch/x86/kvm/pmu.c:
warning: symbol 'fixed_pmc_events' was not declared. Should it be static?

Signed-off-by: default avatarXiubo Li <lixiubo@cmss.chinamobile.com>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent 795a149e

arch/x86/kvm/pmu.c

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ static struct kvm_arch_event_perf_mapping { 
};



/* mapping between fixed pmc index and arch_events array */

int fixed_pmc_events[] = {1, 0, 7};

static int fixed_pmc_events[] = {1, 0, 7};



static bool pmc_is_gp(struct kvm_pmc *pmc)

{

arch/x86/kvm/svm.c

+2 −1
Original line number Diff line number Diff line
@@ -2906,7 +2906,8 @@ static int rdpmc_interception(struct vcpu_svm *svm) 
	return 1;

}



bool check_selective_cr0_intercepted(struct vcpu_svm *svm, unsigned long val)

static bool check_selective_cr0_intercepted(struct vcpu_svm *svm,

					    unsigned long val)

{

	unsigned long cr0 = svm->vcpu.arch.cr0;

	bool ret = false;

arch/x86/kvm/x86.c

+7 −4
Original line number Diff line number Diff line
@@ -4476,7 +4476,8 @@ static int emulator_read_write_onepage(unsigned long addr, void *val, 
	return X86EMUL_CONTINUE;

}



int emulator_read_write(struct x86_emulate_ctxt *ctxt, unsigned long addr,

static int emulator_read_write(struct x86_emulate_ctxt *ctxt,

			unsigned long addr,

			void *val, unsigned int bytes,

			struct x86_exception *exception,

			const struct read_write_emulator_ops *ops)
@@ -4539,7 +4540,7 @@ static int emulator_read_emulated(struct x86_emulate_ctxt *ctxt, 
				   exception, &read_emultor);

}



int emulator_write_emulated(struct x86_emulate_ctxt *ctxt,

static int emulator_write_emulated(struct x86_emulate_ctxt *ctxt,

			    unsigned long addr,

			    const void *val,

			    unsigned int bytes,
@@ -4738,12 +4739,14 @@ static void emulator_wbinvd(struct x86_emulate_ctxt *ctxt) 
	kvm_emulate_wbinvd_noskip(emul_to_vcpu(ctxt));

}



int emulator_get_dr(struct x86_emulate_ctxt *ctxt, int dr, unsigned long *dest)

static int emulator_get_dr(struct x86_emulate_ctxt *ctxt, int dr,

			   unsigned long *dest)

{

	return kvm_get_dr(emul_to_vcpu(ctxt), dr, dest);

}



int emulator_set_dr(struct x86_emulate_ctxt *ctxt, int dr, unsigned long value)

static int emulator_set_dr(struct x86_emulate_ctxt *ctxt, int dr,

			   unsigned long value)

{



	return __kvm_set_dr(emul_to_vcpu(ctxt), dr, value);