[05/19] qemu-kvm: Use upstream VCPU reset services

Commit Message

Jan Kiszka May 4, 2011, 7:43 p.m. UTC

From: Jan Kiszka <[e-mail]>

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

Patch

diff --git a/kvm-all.c b/kvm-all.c
index 693bb4a..a871987 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -183,14 +183,12 @@  static int kvm_set_user_memory_region(KVMState *s, KVMSlot *slot)
     return kvm_vm_ioctl(s, KVM_SET_USER_MEMORY_REGION, &mem);
 }
 
-#ifdef OBSOLETE_KVM_IMPL
 static void kvm_reset_vcpu(void *opaque)
 {
     CPUState *env = opaque;
 
     kvm_arch_reset_vcpu(env);
 }
-#endif
 
 int kvm_irqchip_in_kernel(void)
 {
diff --git a/qemu-kvm-ia64.c b/qemu-kvm-ia64.c
index 39bcbeb..c3c7918 100644
--- a/qemu-kvm-ia64.c
+++ b/qemu-kvm-ia64.c
@@ -120,7 +120,7 @@  void kvm_arch_load_mpstate(CPUState *env)
 #endif
 }
 
-void kvm_arch_cpu_reset(CPUState *env)
+void kvm_arch_reset_vcpu(CPUState *env)
 {
     if (kvm_irqchip_in_kernel(kvm_context)) {
 #ifdef KVM_CAP_MP_STATE
diff --git a/qemu-kvm-x86.c b/qemu-kvm-x86.c
index eb8faf2..d180630 100644
--- a/qemu-kvm-x86.c
+++ b/qemu-kvm-x86.c
@@ -618,11 +618,6 @@  void kvm_arch_push_nmi(void *opaque)
 }
 #endif /* KVM_CAP_USER_NMI */
 
-void kvm_arch_cpu_reset(CPUState *env)
-{
-    kvm_arch_reset_vcpu(env);
-}
-
 #ifdef CONFIG_KVM_DEVICE_ASSIGNMENT
 void kvm_arch_do_ioperm(void *_data)
 {
diff --git a/qemu-kvm.c b/qemu-kvm.c
index b951146..ed72d1c 100644
--- a/qemu-kvm.c
+++ b/qemu-kvm.c
@@ -224,13 +224,6 @@  void kvm_disable_pit_creation(kvm_context_t kvm)
     kvm->no_pit_creation = 1;
 }
 
-static void kvm_reset_vcpu(void *opaque)
-{
-    CPUState *env = opaque;
-
-    kvm_arch_cpu_reset(env);
-}
-
 static void kvm_create_vcpu(CPUState *env, int id)
 {
     long mmap_size;
diff --git a/qemu-kvm.h b/qemu-kvm.h
index 6440d2c..79eb90d 100644
--- a/qemu-kvm.h
+++ b/qemu-kvm.h
@@ -663,7 +663,6 @@  int kvm_arch_has_work(CPUState *env);
 void kvm_arch_process_irqchip_events(CPUState *env);
 int kvm_arch_try_push_interrupts(void *opaque);
 void kvm_arch_push_nmi(void *opaque);
-void kvm_arch_cpu_reset(CPUState *env);
 int kvm_set_boot_cpu_id(uint32_t id);
 
 void qemu_kvm_aio_wait_start(void);