repository: /home/avi/kvm
branch: (no branch)
commit b9fb8ced83d1072d6e6d80396146cec331ef0808
Author: Jerone Young <[EMAIL PROTECTED]>
Date: Tue Nov 6 10:48:48 2007 -0600
kvm: libkvm: move kvm_create_memory_alias & kvm_destroy_memory_alias to
libkvm-x86.c
Signed-off-by: Jerone Young <[EMAIL PROTECTED]>
Signed-off-by: Avi Kivity <[EMAIL PROTECTED]>
diff --git a/libkvm/libkvm-x86.c b/libkvm/libkvm-x86.c
index 49f1e21..46f2ff2 100644
--- a/libkvm/libkvm-x86.c
+++ b/libkvm/libkvm-x86.c
@@ -294,3 +294,32 @@ void *kvm_create_kernel_phys_mem(kvm_context_t kvm,
unsigned long phys_start,
return ptr;
}
+int kvm_create_memory_alias(kvm_context_t kvm,
+ uint64_t phys_addr,
+ uint64_t phys_start,
+ uint64_t len,
+ uint64_t target_phys)
+{
+ struct kvm_memory_alias alias = {
+ .flags = 0,
+ .guest_phys_addr = phys_start,
+ .memory_size = len,
+ .target_phys_addr = target_phys,
+ };
+ int fd = kvm->vm_fd;
+ int r;
+
+ alias.slot = get_slot(phys_addr);
+
+ r = ioctl(fd, KVM_SET_MEMORY_ALIAS, &alias);
+ if (r == -1)
+ return -errno;
+
+ return 0;
+}
+
+int kvm_destroy_memory_alias(kvm_context_t kvm, uint64_t phys_addr)
+{
+ return kvm_create_memory_alias(kvm, phys_addr, 0, 0, 0);
+}
+
diff --git a/libkvm/libkvm.c b/libkvm/libkvm.c
index 571b976..2dc605d 100644
--- a/libkvm/libkvm.c
+++ b/libkvm/libkvm.c
@@ -515,35 +515,6 @@ void kvm_destroy_phys_mem(kvm_context_t kvm, unsigned long
phys_start,
kvm_create_phys_mem(kvm, phys_start, 0, 0, 0);
}
-int kvm_create_memory_alias(kvm_context_t kvm,
- uint64_t phys_addr,
- uint64_t phys_start,
- uint64_t len,
- uint64_t target_phys)
-{
- struct kvm_memory_alias alias = {
- .flags = 0,
- .guest_phys_addr = phys_start,
- .memory_size = len,
- .target_phys_addr = target_phys,
- };
- int fd = kvm->vm_fd;
- int r;
-
- alias.slot = get_slot(phys_addr);
-
- r = ioctl(fd, KVM_SET_MEMORY_ALIAS, &alias);
- if (r == -1)
- return -errno;
-
- return 0;
-}
-
-int kvm_destroy_memory_alias(kvm_context_t kvm, uint64_t phys_addr)
-{
- return kvm_create_memory_alias(kvm, phys_addr, 0, 0, 0);
-}
-
static int kvm_get_map(kvm_context_t kvm, int ioctl_num, int slot, void *buf)
{
int r;
-------------------------------------------------------------------------
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-commits mailing list
kvm-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/kvm-commits
