x86: sparse fixes for kvm/x86.c
PATCH 1/1 x86: sparse fixes for kvm/x86.c
Although this looks strange:
gpa = vcpu->arch.mmu.gva_to_gpa(vcpu, (gva_t)tmp);
it is correct as tmp is just used a dummy for this one call and not used again, just needed a stand-in. tmp will be used in a kmap_atomic/kunmap_atomic pair right afterwards. Use the gva_t cast to keep types happy.
In two case statements, use the ever popular 'i' instead of index:arch/x86/kvm/x86.c:935:7: warning: symbol 'index' shadows an earlier one arch/x86/kvm/x86.c:872:9: originally declared here arch/x86/kvm/x86.c:951:7: warning: symbol 'index' shadows an earlier one arch/x86/kvm/x86.c:872:9: originally declared here
X86_32-only: use tmp instead of addr which shadows a function arg name:arch/x86/kvm/x86.c:1742:8: warning: symbol 'addr' shadows an earlier one arch/x86/kvm/x86.c:1725:52: originally declared here
Make it static:arch/x86/kvm/x86.c:1832:24: warning: symbol 'emulate_ops' was not declared. Should it be static?
Drop the return statements:arch/x86/kvm/x86.c:2764:2: warning: returning void-valued expression arch/x86/kvm/x86.c:2830:2: warning: returning void-valued expression
--- arch/x86/kvm/x86.c | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-)
arch/x86/kvm/x86.c +18 -18
@@ -932,32 +932,32 @@ static void do_cpuid_ent(struct kvm_cpuid_entry2 *entry, u32 function, }/* function 4 and 0xb have additional index. */ case 4 : { -int index, cache_type; +int i, cache_type; entry->flags |=KVM_CPUID_FLAG_SIGNIFCANT_INDEX ;/* read more entries until cache_type is zero */ -for (index =1 ; *nent < maxnent; ++index) { - cache_type = entry[index -1 ].eax &0x1f ; +for (i =1 ; *nent < maxnent; ++i) { + cache_type = entry[i -1 ].eax &0x1f ;if (!cache_type)break ; -do_cpuid_1_ent (&entry[index], function, index); - entry[index].flags |= +do_cpuid_1_ent (&entry[i], function, i); + entry[i].flags |=KVM_CPUID_FLAG_SIGNIFCANT_INDEX ; ++*nent; }break ; }case 0xb : { -int index, level_type; +int i, level_type; entry->flags |=KVM_CPUID_FLAG_SIGNIFCANT_INDEX ;/* read more entries until level_type is zero */ -for (index =1 ; *nent < maxnent; ++index) { - level_type = entry[index -1 ].ecx &0xff ; +for (i =1 ; *nent < maxnent; ++i) { + level_type = entry[i -1 ].ecx &0xff ;if (!level_type)break ; -do_cpuid_1_ent (&entry[index], function, index); - entry[index].flags |= +do_cpuid_1_ent (&entry[i], function, i); + entry[i].flags |=KVM_CPUID_FLAG_SIGNIFCANT_INDEX ; ++*nent; }
@@ -1739,11 +1739,11 @@ static int emulator_cmpxchg_emulated(unsigned long addr,if (bytes ==8 ) {gpa_t gpa;struct page *page; -char *addr; +char *tmp;u64 val;down_read (¤t->mm->mmap_sem); - gpa = vcpu->arch.mmu.gva_to_gpa (vcpu, addr); + gpa = vcpu->arch.mmu.gva_to_gpa (vcpu, (gva_t )tmp);if (gpa ==UNMAPPED_GVA || (gpa &PAGE_MASK ) ==APIC_DEFAULT_PHYS_BASE )
@@ -1754,9 +1754,9 @@ static int emulator_cmpxchg_emulated(unsigned long addr, val = *(u64 *)new; page =gfn_to_page (vcpu->kvm, gpa >>PAGE_SHIFT ); - addr =kmap_atomic (page,KM_USER0 ); -set_64bit ((u64 *)(addr +offset_in_page (gpa)), val); -kunmap_atomic (addr,KM_USER0 ); + tmp =kmap_atomic (page,KM_USER0 ); +set_64bit ((u64 *)(tmp +offset_in_page (gpa)), val); +kunmap_atomic (tmp,KM_USER0 );kvm_release_page_dirty (page); emul_write:up_read (¤t->mm->mmap_sem);
@@ -1829,7 +1829,7 @@ void kvm_report_emulation_failure(struct kvm_vcpu *vcpu, const char *context) }EXPORT_SYMBOL_GPL (kvm_report_emulation_failure); -struct x86_emulate_ops emulate_ops = { +static struct x86_emulate_ops emulate_ops = { .read_std = emulator_read_std, .read_emulated = emulator_read_emulated, .write_emulated = emulator_write_emulated,
@@ -2761,7 +2761,7 @@ int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs)static void get_segment (struct kvm_vcpu *vcpu,struct kvm_segment *var,int seg) { -return kvm_x86_ops->get_segment (vcpu, var, seg); + kvm_x86_ops->get_segment (vcpu, var, seg); }void kvm_get_cs_db_l_bits (struct kvm_vcpu *vcpu,int *db,int *l)
@@ -2827,7 +2827,7 @@ int kvm_arch_vcpu_ioctl_get_sregs(struct kvm_vcpu *vcpu,static void set_segment (struct kvm_vcpu *vcpu,struct kvm_segment *var,int seg) { -return kvm_x86_ops->set_segment (vcpu, var, seg); + kvm_x86_ops->set_segment (vcpu, var, seg); } int kvm_arch_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu,
Signature · 1 line
1.5.4.rc5.1138.g2602