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

[Jerone Young <jyoung5-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>]

# HG changeset patch
# User Jerone Young <jyoung5-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
# Date 1194560092 21600
# Node ID 10991ad11487e51d327430a1a61e0d63021caf7b
# Parent  026c26ab068482aaf17deaf8cd73c1ff1db3806b
[v2] Fix declerations that should be in kvm-common.h & not in kvm-x86.h

The last version of this patch was based on yesterdays Hg tree. There
have been changes today. So this updates them so you don't need to Avi.

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-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>

diff --git a/libkvm/kvm-common.h b/libkvm/kvm-common.h
--- a/libkvm/kvm-common.h
+++ b/libkvm/kvm-common.h
@@ -57,11 +57,24 @@ void register_slot(int slot, unsigned lo
 		   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);
diff --git a/libkvm/kvm-x86.h b/libkvm/kvm-x86.h
--- a/libkvm/kvm-x86.h
+++ b/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

-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/