[08/16] qemu-kvm: Make some private functions static

Commit Message

Jan Kiszka May 13, 2011, 12:14 p.m. UTC

Signed-off-by: Jan Kiszka <[e-mail]>
---
 qemu-kvm.c |   12 ++++++------
 qemu-kvm.h |   32 --------------------------------
 2 files changed, 6 insertions(+), 38 deletions(-)

Patch

diff --git a/qemu-kvm.c b/qemu-kvm.c
index 8b98ec8..48c92e6 100644
--- a/qemu-kvm.c
+++ b/qemu-kvm.c
@@ -350,12 +350,12 @@  static int handle_mmio(CPUState *env)
     return 0;
 }
 
-int handle_io_window(kvm_context_t kvm)
+static int handle_io_window(kvm_context_t kvm)
 {
     return 1;
 }
 
-int handle_shutdown(kvm_context_t kvm, CPUState *env)
+static int handle_shutdown(kvm_context_t kvm, CPUState *env)
 {
     /* stop the current vcpu from going back to guest mode */
     env->stopped = 1;
@@ -371,14 +371,14 @@  static inline void push_nmi(kvm_context_t kvm)
 #endif                          /* KVM_CAP_USER_NMI */
 }
 
-void post_kvm_run(kvm_context_t kvm, CPUState *env)
+static void post_kvm_run(kvm_context_t kvm, CPUState *env)
 {
     pthread_mutex_lock(&qemu_mutex);
     kvm_arch_post_run(env, env->kvm_run);
     cpu_single_env = env;
 }
 
-int pre_kvm_run(kvm_context_t kvm, CPUState *env)
+static int pre_kvm_run(kvm_context_t kvm, CPUState *env)
 {
     kvm_arch_pre_run(env, env->kvm_run);
 
@@ -391,7 +391,7 @@  int kvm_is_ready_for_interrupt_injection(CPUState *env)
     return env->kvm_run->ready_for_interrupt_injection;
 }
 
-int kvm_run(CPUState *env)
+static int kvm_run(CPUState *env)
 {
     int r;
     kvm_context_t kvm = &env->kvm_state->kvm_context;
@@ -984,7 +984,7 @@  int kvm_cpu_exec(CPUState *env)
     return 0;
 }
 
-int kvm_cpu_is_stopped(CPUState *env)
+static int kvm_cpu_is_stopped(CPUState *env)
 {
     return !vm_running || env->stopped;
 }
diff --git a/qemu-kvm.h b/qemu-kvm.h
index 693d554..cd9bb37 100644
--- a/qemu-kvm.h
+++ b/qemu-kvm.h
@@ -66,40 +66,9 @@  typedef struct kvm_context *kvm_context_t;
 
 int kvm_arch_run(CPUState *env);
 
-int handle_halt(CPUState *env);
-
-int handle_shutdown(kvm_context_t kvm, CPUState *env);
-void post_kvm_run(kvm_context_t kvm, CPUState *env);
-int pre_kvm_run(kvm_context_t kvm, CPUState *env);
-int handle_io_window(kvm_context_t kvm);
-int try_push_interrupts(kvm_context_t kvm);
-
 int kvm_create_irqchip(kvm_context_t kvm);
 
 /*!
- * \brief Start the VCPU
- *
- * This starts the VCPU and virtualization is started.\n
- * \n
- * This function will not return until any of these conditions are met:
- * - An IO/MMIO handler does not return "0"
- * - An exception that neither the guest OS, nor KVM can handle occurs
- *
- * \note This function will call the callbacks registered in kvm_init()
- * to emulate those functions
- * \note If you at any point want to interrupt the VCPU, kvm_run() will
- * listen to the EINTR signal. This allows you to simulate external interrupts
- * and asyncronous IO.
- *
- * \param kvm Pointer to the current kvm_context
- * \param vcpu Which virtual CPU should be started
- * \return 0 on success, but you really shouldn't expect this function to
- * return except for when an error has occured, or when you have sent it
- * an EINTR signal.
- */
-int kvm_run(CPUState *env);
-
-/*!
  * \brief Check if a vcpu is ready for interrupt injection
  *
  * This checks if vcpu interrupts are not masked by mov ss or sti.
@@ -487,7 +456,6 @@  struct KVMState {
 int kvm_tpr_enable_vapic(CPUState *env);
 
 unsigned long kvm_get_thread_id(void);
-int kvm_cpu_is_stopped(CPUState *env);
 
 #endif