HVM-314 make_all_cpus_request shouldn't be extern in kvm.c

HVM-315 Vars in kvm.c missing static keyword

2 files changed, 10 insertions, 17 deletions

diff --git a/kvm.c b/kvm.c
index 968c26d..013f2c7 100644
--- a/kvm.c
+++ b/kvm.c
@@ -83,14 +83,15 @@ static vmem_t *kvm_minor;	/* minor number arena */
 static dev_info_t *kvm_dip;	/* global devinfo hanlde */
 static minor_t kvm_base_minor;	/* The only minor device that can be opened */
 
-int kvmid;  /* monotonically increasing, unique per vm */
+static int kvmid;  /* monotonically increasing, unique per vm */
 
-int largepages_enabled = 1;
+static int largepages_enabled = 1;
 static cpuset_t cpus_hardware_enabled;
 static volatile uint32_t hardware_enable_failed;
 static int kvm_usage_count;
 static list_t vm_list;
-kmutex_t kvm_lock;
+static kmutex_t kvm_lock;
+static int ignore_msrs = 0;
 
 /*
  * Driver forward declarations
@@ -158,9 +159,7 @@ static void kvm_destroy_vm(struct kvm *);
 static int kvm_avlmmucmp(const void *, const void *);
 extern struct kvm_x86_ops vmx_x86_ops;
 extern struct kvm_shared_msrs **shared_msrs;
-extern int make_all_cpus_request(struct kvm *, unsigned int);
 struct kvm_shared_msrs_global shared_msrs_global;
-int ignore_msrs = 0;
 static void kvm_on_user_return(struct kvm_vcpu *,
     struct kvm_user_return_notifier *);
 page_t *bad_page;
@@ -168,12 +167,6 @@ pfn_t bad_pfn;
 kmem_cache_t *kvm_vcpu_cache;
 struct kvm_x86_ops *kvm_x86_ops;
 
-
-ulong_t *vmx_vpid_bitmap;
-size_t vpid_bitmap_words;
-kmutex_t vmx_vpid_lock;
-
-
 inline int
 kvm_exception_is_soft(unsigned int nr)
 {
@@ -260,12 +253,6 @@ gfn_to_memslot_unaliased(struct kvm *kvm, gfn_t gfn)
 	return (NULL);
 }
 
-void
-kvm_reload_remote_mmus(struct kvm *kvm)
-{
-	make_all_cpus_request(kvm, KVM_REQ_MMU_RELOAD);
-}
-
 gfn_t
 unalias_gfn_instantiation(struct kvm *kvm, gfn_t gfn)
 {
diff --git a/kvm_x86.c b/kvm_x86.c
index ffb8e02..9ea4429 100644
--- a/kvm_x86.c
+++ b/kvm_x86.c
@@ -1324,3 +1324,9 @@ kvm_arch_vcpu_runnable(struct kvm_vcpu *vcpu)
 	    vcpu->arch.nmi_pending ||
 	    (kvm_arch_interrupt_allowed(vcpu) && kvm_cpu_has_interrupt(vcpu)));
 }
+
+void
+kvm_reload_remote_mmus(struct kvm *kvm)
+{
+	make_all_cpus_request(kvm, KVM_REQ_MMU_RELOAD);
+}