diff options
| author | Stephen Hemminger <stephen@networkplumber.org> | 2013-12-29 12:12:29 -0800 | 
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2014-01-08 19:02:58 -0200 | 
| commit | 7940876e1330671708186ac3386aa521ffb5c182 (patch) | |
| tree | abe06165870e77111ba9e3d1b5f900c1cd8c4cef /virt | |
| parent | 2f0a6397dd3cac2fb05b46cad08c1d532c04d6b8 (diff) | |
| download | linux-7940876e1330671708186ac3386aa521ffb5c182.tar.bz2 | |
kvm: make local functions static
Running 'make namespacecheck' found lots of functions that
should be declared static, since only used in one file.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'virt')
| -rw-r--r-- | virt/kvm/ioapic.c | 2 | ||||
| -rw-r--r-- | virt/kvm/ioapic.h | 1 | ||||
| -rw-r--r-- | virt/kvm/kvm_main.c | 35 | 
3 files changed, 19 insertions, 19 deletions
| diff --git a/virt/kvm/ioapic.c b/virt/kvm/ioapic.c index 2d682977ce82..ce9ed99ad7dc 100644 --- a/virt/kvm/ioapic.c +++ b/virt/kvm/ioapic.c @@ -520,7 +520,7 @@ static int ioapic_mmio_write(struct kvm_io_device *this, gpa_t addr, int len,  	return 0;  } -void kvm_ioapic_reset(struct kvm_ioapic *ioapic) +static void kvm_ioapic_reset(struct kvm_ioapic *ioapic)  {  	int i; diff --git a/virt/kvm/ioapic.h b/virt/kvm/ioapic.h index 615d8c995c3c..90d43e95dcf8 100644 --- a/virt/kvm/ioapic.h +++ b/virt/kvm/ioapic.h @@ -91,7 +91,6 @@ void kvm_ioapic_destroy(struct kvm *kvm);  int kvm_ioapic_set_irq(struct kvm_ioapic *ioapic, int irq, int irq_source_id,  		       int level, bool line_status);  void kvm_ioapic_clear_all(struct kvm_ioapic *ioapic, int irq_source_id); -void kvm_ioapic_reset(struct kvm_ioapic *ioapic);  int kvm_irq_delivery_to_apic(struct kvm *kvm, struct kvm_lapic *src,  		struct kvm_lapic_irq *irq, unsigned long *dest_map);  int kvm_get_ioapic(struct kvm *kvm, struct kvm_ioapic_state *state); diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 3efba97bdce2..e7c6ddd8ecc0 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -95,6 +95,12 @@ static int hardware_enable_all(void);  static void hardware_disable_all(void);  static void kvm_io_bus_destroy(struct kvm_io_bus *bus); +static void update_memslots(struct kvm_memslots *slots, +			    struct kvm_memory_slot *new, u64 last_generation); + +static void kvm_release_pfn_dirty(pfn_t pfn); +static void mark_page_dirty_in_slot(struct kvm *kvm, +				    struct kvm_memory_slot *memslot, gfn_t gfn);  bool kvm_rebooting;  EXPORT_SYMBOL_GPL(kvm_rebooting); @@ -553,7 +559,7 @@ static void kvm_free_physmem_slot(struct kvm *kvm, struct kvm_memory_slot *free,  	free->npages = 0;  } -void kvm_free_physmem(struct kvm *kvm) +static void kvm_free_physmem(struct kvm *kvm)  {  	struct kvm_memslots *slots = kvm->memslots;  	struct kvm_memory_slot *memslot; @@ -675,8 +681,9 @@ static void sort_memslots(struct kvm_memslots *slots)  		slots->id_to_index[slots->memslots[i].id] = i;  } -void update_memslots(struct kvm_memslots *slots, struct kvm_memory_slot *new, -		     u64 last_generation) +static void update_memslots(struct kvm_memslots *slots, +			    struct kvm_memory_slot *new, +			    u64 last_generation)  {  	if (new) {  		int id = new->id; @@ -924,8 +931,8 @@ int kvm_set_memory_region(struct kvm *kvm,  }  EXPORT_SYMBOL_GPL(kvm_set_memory_region); -int kvm_vm_ioctl_set_memory_region(struct kvm *kvm, -				   struct kvm_userspace_memory_region *mem) +static int kvm_vm_ioctl_set_memory_region(struct kvm *kvm, +					  struct kvm_userspace_memory_region *mem)  {  	if (mem->slot >= KVM_USER_MEM_SLOTS)  		return -EINVAL; @@ -1047,7 +1054,7 @@ static unsigned long gfn_to_hva_many(struct kvm_memory_slot *slot, gfn_t gfn,  }  unsigned long gfn_to_hva_memslot(struct kvm_memory_slot *slot, -				 gfn_t gfn) +					gfn_t gfn)  {  	return gfn_to_hva_many(slot, gfn, NULL);  } @@ -1387,18 +1394,11 @@ void kvm_release_page_dirty(struct page *page)  }  EXPORT_SYMBOL_GPL(kvm_release_page_dirty); -void kvm_release_pfn_dirty(pfn_t pfn) +static void kvm_release_pfn_dirty(pfn_t pfn)  {  	kvm_set_pfn_dirty(pfn);  	kvm_release_pfn_clean(pfn);  } -EXPORT_SYMBOL_GPL(kvm_release_pfn_dirty); - -void kvm_set_page_dirty(struct page *page) -{ -	kvm_set_pfn_dirty(page_to_pfn(page)); -} -EXPORT_SYMBOL_GPL(kvm_set_page_dirty);  void kvm_set_pfn_dirty(pfn_t pfn)  { @@ -1640,8 +1640,9 @@ int kvm_clear_guest(struct kvm *kvm, gpa_t gpa, unsigned long len)  }  EXPORT_SYMBOL_GPL(kvm_clear_guest); -void mark_page_dirty_in_slot(struct kvm *kvm, struct kvm_memory_slot *memslot, -			     gfn_t gfn) +static void mark_page_dirty_in_slot(struct kvm *kvm, +				    struct kvm_memory_slot *memslot, +				    gfn_t gfn)  {  	if (memslot && memslot->dirty_bitmap) {  		unsigned long rel_gfn = gfn - memslot->base_gfn; @@ -1757,7 +1758,7 @@ EXPORT_SYMBOL_GPL(kvm_vcpu_yield_to);   *  locking does not harm. It may result in trying to yield to  same VCPU, fail   *  and continue with next VCPU and so on.   */ -bool kvm_vcpu_eligible_for_directed_yield(struct kvm_vcpu *vcpu) +static bool kvm_vcpu_eligible_for_directed_yield(struct kvm_vcpu *vcpu)  {  	bool eligible; |