# HG changeset patch
# User Jerone Young <[EMAIL PROTECTED]>
# Date 1193849564 18000
# Node ID e2a804737e3b4847d7150dd5141e24a95460c46e
# Parent e0abf43119181082d46e21c02b07f275f08db02b
Move kvm_destroy_phys_mem to kvmctl-x86.c
Signed-off-by: Jerone Young <[EMAIL PROTECTED]>
diff --git a/libkvm/libkvm-x86.c b/libkvm/libkvm-x86.c
--- a/libkvm/libkvm-x86.c
+++ b/libkvm/libkvm-x86.c
@@ -318,3 +318,29 @@ void *kvm_create_phys_mem(kvm_context_t
log, writable);
}
+/* destroy/free a whole slot.
+ * phys_start, len and slot are the params passed to kvm_create_phys_mem()
+ */
+void kvm_destroy_phys_mem(kvm_context_t kvm, unsigned long phys_start,
+ unsigned long len)
+{
+ int slot;
+ struct kvm_memory_region *mem;
+
+ slot = get_slot(phys_start);
+
+ if (slot >= KVM_MAX_NUM_MEM_REGIONS) {
+ fprintf(stderr, "BUG: %s: invalid parameters (slot=%d)\n",
+ __FUNCTION__, slot);
+ return;
+ }
+ mem = &kvm->mem_regions[slot];
+ if (phys_start != mem->guest_phys_addr) {
+ fprintf(stderr,
+ "WARNING: %s: phys_start is 0x%lx expecting 0x%llx\n",
+ __FUNCTION__, phys_start, mem->guest_phys_addr);
+ phys_start = mem->guest_phys_addr;
+ }
+ kvm_create_phys_mem(kvm, phys_start, 0, 0, 0);
+}
+
diff --git a/libkvm/libkvm-x86.h b/libkvm/libkvm-x86.h
--- a/libkvm/libkvm-x86.h
+++ b/libkvm/libkvm-x86.h
@@ -29,4 +29,7 @@ void *kvm_create_phys_mem(kvm_context_t
void *kvm_create_phys_mem(kvm_context_t kvm, unsigned long phys_start,
unsigned long len, int log, int writable);
+void kvm_destroy_phys_mem(kvm_context_t kvm, unsigned long phys_start,
+ unsigned long len);
+
#endif
diff --git a/libkvm/libkvm.c b/libkvm/libkvm.c
--- a/libkvm/libkvm.c
+++ b/libkvm/libkvm.c
@@ -440,32 +440,6 @@ int kvm_register_userspace_phys_mem(kvm_
#endif
}
-
-/* destroy/free a whole slot.
- * phys_start, len and slot are the params passed to kvm_create_phys_mem()
- */
-void kvm_destroy_phys_mem(kvm_context_t kvm, unsigned long phys_start,
- unsigned long len)
-{
- int slot;
- struct kvm_memory_region *mem;
-
- slot = get_slot(phys_start);
-
- if (slot >= KVM_MAX_NUM_MEM_REGIONS) {
- fprintf(stderr, "BUG: %s: invalid parameters (slot=%d)\n",
- __FUNCTION__, slot);
- return;
- }
- mem = &kvm->mem_regions[slot];
- if (phys_start != mem->guest_phys_addr) {
- fprintf(stderr,
- "WARNING: %s: phys_start is 0x%lx expecting 0x%llx\n",
- __FUNCTION__, phys_start, mem->guest_phys_addr);
- phys_start = mem->guest_phys_addr;
- }
- kvm_create_phys_mem(kvm, phys_start, 0, 0, 0);
-}
int kvm_create_memory_alias(kvm_context_t kvm,
uint64_t phys_addr,
diff --git a/libkvm/libkvm.h b/libkvm/libkvm.h
--- a/libkvm/libkvm.h
+++ b/libkvm/libkvm.h
@@ -447,8 +447,6 @@ void kvm_show_regs(kvm_context_t kvm, in
void kvm_show_regs(kvm_context_t kvm, int vcpu);
-void kvm_destroy_phys_mem(kvm_context_t, unsigned long phys_start,
- unsigned long len);
int kvm_register_userspace_phys_mem(kvm_context_t kvm,
unsigned long phys_start, void *userspace_addr,
unsigned long len, int log);
-------------------------------------------------------------------------
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/
_______________________________________________
kvm-devel mailing list
kvm-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/kvm-devel
