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

Commit 48d89b92 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

KVM: x86: fix some sparse warnings 



Sparse reports the following easily fixed warnings:

   arch/x86/kvm/vmx.c:8795:48: sparse: Using plain integer as NULL pointer
   arch/x86/kvm/vmx.c:2138:5: sparse: symbol vmx_read_l1_tsc was not declared. Should it be static?
   arch/x86/kvm/vmx.c:6151:48: sparse: Using plain integer as NULL pointer
   arch/x86/kvm/vmx.c:8851:6: sparse: symbol vmx_sched_in was not declared. Should it be static?

   arch/x86/kvm/svm.c:2162:5: sparse: symbol svm_read_l1_tsc was not declared. Should it be static?

Cc: Radim Krčmář <rkrcmar@redhat.com>
Signed-off-by: default avatarFengguang Wu <fengguang.wu@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent a7c0b07d

arch/x86/kvm/svm.c

+1 −1
Original line number Diff line number Diff line
@@ -3031,7 +3031,7 @@ static int cr8_write_interception(struct vcpu_svm *svm) 
	return 0;

}



u64 svm_read_l1_tsc(struct kvm_vcpu *vcpu, u64 host_tsc)

static u64 svm_read_l1_tsc(struct kvm_vcpu *vcpu, u64 host_tsc)

{

	struct vmcb *vmcb = get_host_vmcb(to_svm(vcpu));

	return vmcb->control.tsc_offset +

arch/x86/kvm/vmx.c

+6 −6
Original line number Diff line number Diff line
@@ -2159,7 +2159,7 @@ static u64 guest_read_tsc(void) 
 * Like guest_read_tsc, but always returns L1's notion of the timestamp

 * counter, even if a nested guest (L2) is currently running.

 */

u64 vmx_read_l1_tsc(struct kvm_vcpu *vcpu, u64 host_tsc)

static u64 vmx_read_l1_tsc(struct kvm_vcpu *vcpu, u64 host_tsc)

{

	u64 tsc_offset;
@@ -6246,11 +6246,11 @@ static void free_nested(struct vcpu_vmx *vmx) 
	/* Unpin physical memory we referred to in current vmcs02 */

	if (vmx->nested.apic_access_page) {

		nested_release_page(vmx->nested.apic_access_page);

		vmx->nested.apic_access_page = 0;

		vmx->nested.apic_access_page = NULL;

	}

	if (vmx->nested.virtual_apic_page) {

		nested_release_page(vmx->nested.virtual_apic_page);

		vmx->nested.virtual_apic_page = 0;

		vmx->nested.virtual_apic_page = NULL;

	}



	nested_free_all_saved_vmcss(vmx);
@@ -8950,11 +8950,11 @@ static void nested_vmx_vmexit(struct kvm_vcpu *vcpu, u32 exit_reason, 
	/* Unpin physical memory we referred to in vmcs02 */

	if (vmx->nested.apic_access_page) {

		nested_release_page(vmx->nested.apic_access_page);

		vmx->nested.apic_access_page = 0;

		vmx->nested.apic_access_page = NULL;

	}

	if (vmx->nested.virtual_apic_page) {

		nested_release_page(vmx->nested.virtual_apic_page);

		vmx->nested.virtual_apic_page = 0;

		vmx->nested.virtual_apic_page = NULL;

	}



	/*
@@ -9010,7 +9010,7 @@ static int vmx_check_intercept(struct kvm_vcpu *vcpu, 
	return X86EMUL_CONTINUE;

}



void vmx_sched_in(struct kvm_vcpu *vcpu, int cpu)

static void vmx_sched_in(struct kvm_vcpu *vcpu, int cpu)

{

	if (ple_gap)

		shrink_ple_window(vcpu);