kvm: libkvm: fix declerations that should be in kvm-common.h & not in kvm-x86.h

During the first phase of the refactoring these function declerations
where not moved over to the kvm-common.h.

Function decleartions include:
	kvm_alloc_kernel_memory
	kvm_alloc_userspace_memory
	kvm_create_kernel_phys_mem
	kvm_show_code
	kvm_run_abi10

Signed-off-by: Jerone Young <jyoung5@us.ibm.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>

2 files changed, 13 insertions, 17 deletions

diff --git a/kvm/libkvm/kvm-common.h b/kvm/libkvm/kvm-common.h
index bb54e44c5..c5bc8aebd 100644
--- a/kvm/libkvm/kvm-common.h
+++ b/kvm/libkvm/kvm-common.h
@@ -57,12 +57,25 @@ void register_slot(int slot, unsigned long phys_addr, unsigned long len,
 		   int user_alloc, unsigned long userspace_addr);
 void free_slot(int slot);
 int get_slot(unsigned long phys_addr);
+
+int kvm_alloc_kernel_memory(kvm_context_t kvm, unsigned long memory,
+								void **vm_mem);
+int kvm_alloc_userspace_memory(kvm_context_t kvm, unsigned long memory,
+								void **vm_mem);
+void *kvm_create_kernel_phys_mem(kvm_context_t kvm, unsigned long phys_start,
+			unsigned long len, int log, int writable);
+
+
 int kvm_arch_create(kvm_context_t kvm, unsigned long phys_mem_bytes,
                         void **vm_mem);
 int kvm_arch_create_default_phys_mem(kvm_context_t kvm,
                                        unsigned long phys_mem_bytes,
                                        void **vm_mem);
 
+void kvm_show_code(kvm_context_t kvm, int vcpu);
+int kvm_run_abi10(kvm_context_t kvm, int vcpu);
+
+
 int handle_halt(kvm_context_t kvm, int vcpu);
 int handle_shutdown(kvm_context_t kvm, int vcpu);
 void post_kvm_run(kvm_context_t kvm, int vcpu);
diff --git a/kvm/libkvm/kvm-x86.h b/kvm/libkvm/kvm-x86.h
index bcc6981e7..0769bb5b2 100644
--- a/kvm/libkvm/kvm-x86.h
+++ b/kvm/libkvm/kvm-x86.h
@@ -20,26 +20,9 @@
 
 #include "kvm-common.h"
 
-#include "kvm-common.h"
-
 #define PAGE_SIZE 4096ul
 #define PAGE_MASK (~(PAGE_SIZE - 1))
 
-
-int kvm_alloc_kernel_memory(kvm_context_t kvm, unsigned long memory,
-								void **vm_mem);
-
-int kvm_alloc_userspace_memory(kvm_context_t kvm, unsigned long memory,
-								void **vm_mem);
-
 int kvm_set_tss_addr(kvm_context_t kvm, unsigned long addr);
 
-
-void *kvm_create_kernel_phys_mem(kvm_context_t kvm, unsigned long phys_start,
-			unsigned long len, int log, int writable);
-
-int kvm_run_abi10(kvm_context_t kvm, int vcpu);
-
-void kvm_show_code(kvm_context_t kvm, int vcpu);
-
 #endif