[kvm-devel] [PATCH] Fix declerations that should be in kvm-common.h & not in kvm-x86.h

[Jerone Y. <jy...@us...>]

# HG changeset patch
# User Jerone Young <jy...@us...>
# Date 1194543880 21600
# Node ID f87e6f60ddd69cb0ee4e0bbcaed657d2f12311ce
# Parent  d6fa0d16fa60ee5083877fec698b69cea840d0b0
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 <jy...@us...>

diff --git a/libkvm/kvm-common.h b/libkvm/kvm-common.h
--- a/libkvm/kvm-common.h
+++ b/libkvm/kvm-common.h
@@ -55,6 +55,14 @@ int get_free_slot(kvm_context_t kvm);
 int get_free_slot(kvm_context_t kvm);
 void register_slot(int slot, unsigned long phys_addr);
 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);
+
 void kvm_memory_region_save_params(kvm_context_t kvm,
                                         struct kvm_memory_region *mem);
 void kvm_userspace_memory_region_save_params(kvm_context_t kvm,
@@ -67,6 +75,10 @@ int kvm_arch_create_default_phys_mem(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/libkvm/kvm-x86.h b/libkvm/kvm-x86.h
--- a/libkvm/kvm-x86.h
+++ b/libkvm/kvm-x86.h
@@ -20,27 +20,10 @@
 
 #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);
 
 struct kvm_msr_list *kvm_get_msr_list(kvm_context_t);
 int kvm_get_msrs(kvm_context_t, int vcpu, struct kvm_msr_entry *msrs, int n);