[01/16] qemu-kvm: Drop kvm_cpu_register_phys_memory_client wrapper

Commit Message

Jan Kiszka May 13, 2011, 12:13 p.m. UTC

Signed-off-by: Jan Kiszka <[e-mail]>
---
 kvm-all.c  |    5 -----
 kvm.h      |    2 --
 qemu-kvm.c |    2 +-
 3 files changed, 1 insertions(+), 8 deletions(-)

Patch

diff --git a/kvm-all.c b/kvm-all.c
index c1be056..d744cb2 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -675,11 +675,6 @@  static CPUPhysMemoryClient kvm_cpu_phys_memory_client = {
     .log_stop = kvm_log_stop,
 };
 
-void kvm_cpu_register_phys_memory_client(void)
-{
-    cpu_register_phys_memory_client(&kvm_cpu_phys_memory_client);
-}
-
 #ifdef OBSOLETE_KVM_IMPL
 static void kvm_handle_interrupt(CPUState *env, int mask)
 {
diff --git a/kvm.h b/kvm.h
index 179eb7e..2445d40 100644
--- a/kvm.h
+++ b/kvm.h
@@ -63,8 +63,6 @@  int kvm_init_vcpu(CPUState *env);
 int kvm_cpu_exec(CPUState *env);
 
 #if !defined(CONFIG_USER_ONLY)
-void kvm_cpu_register_phys_memory_client(void);
-
 void kvm_setup_guest_memory(void *start, size_t size);
 
 int kvm_coalesce_mmio_region(target_phys_addr_t start, ram_addr_t size);
diff --git a/qemu-kvm.c b/qemu-kvm.c
index cf02ceb..628653b 100644
--- a/qemu-kvm.c
+++ b/qemu-kvm.c
@@ -192,7 +192,7 @@  int kvm_init(void)
         }
     }
 
-    kvm_cpu_register_phys_memory_client();
+    cpu_register_phys_memory_client(&kvm_cpu_phys_memory_client);
 
     pthread_mutex_lock(&qemu_mutex);
     return kvm_create_context();