[02/19] qemu-kvm: x86: Use upstream kvmclock device

Commit Message

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

From: Jan Kiszka <[e-mail]>

Upstream kvmclock device is actually more advanced these days while
using a compatible vmstate. Time to switch over.

Signed-off-by: Jan Kiszka <[e-mail]>
---
 hw/pc_piix.c   |    2 --
 qemu-kvm-x86.c |   37 -------------------------------------
 2 files changed, 0 insertions(+), 39 deletions(-)

Patch

diff --git a/hw/pc_piix.c b/hw/pc_piix.c
index 8ee7bed..7b7c4de 100644
--- a/hw/pc_piix.c
+++ b/hw/pc_piix.c
@@ -94,11 +94,9 @@  static void pc_init1(ram_addr_t ram_size,
 
     pc_cpus_init(cpu_model);
 
-#ifdef OBSOLETE_KVM_IMPL
     if (kvmclock_enabled) {
         kvmclock_create();
     }
-#endif
 
     /* allocate ram and load rom/bios */
     pc_memory_init(ram_size, kernel_filename, kernel_cmdline, initrd_filename,
diff --git a/qemu-kvm-x86.c b/qemu-kvm-x86.c
index 26ac852..844d345 100644
--- a/qemu-kvm-x86.c
+++ b/qemu-kvm-x86.c
@@ -478,37 +478,6 @@  static int kvm_enable_tpr_access_reporting(CPUState *env)
 }
 #endif
 
-#ifdef KVM_CAP_ADJUST_CLOCK
-static struct kvm_clock_data kvmclock_data;
-
-static void kvmclock_pre_save(void *opaque)
-{
-    struct kvm_clock_data *cl = opaque;
-
-    kvm_vm_ioctl(kvm_state, KVM_GET_CLOCK, cl);
-}
-
-static int kvmclock_post_load(void *opaque, int version_id)
-{
-    struct kvm_clock_data *cl = opaque;
-
-    return kvm_vm_ioctl(kvm_state, KVM_SET_CLOCK, cl);
-}
-
-static const VMStateDescription vmstate_kvmclock= {
-    .name = "kvmclock",
-    .version_id = 1,
-    .minimum_version_id = 1,
-    .minimum_version_id_old = 1,
-    .pre_save = kvmclock_pre_save,
-    .post_load = kvmclock_post_load,
-    .fields      = (VMStateField []) {
-        VMSTATE_U64(clock, struct kvm_clock_data),
-        VMSTATE_END_OF_LIST()
-    }
-};
-#endif
-
 int kvm_arch_qemu_create_context(void)
 {
     int r;
@@ -532,12 +501,6 @@  int kvm_arch_qemu_create_context(void)
         return -1;
     }
 
-#ifdef KVM_CAP_ADJUST_CLOCK
-    if (kvm_check_extension(kvm_state, KVM_CAP_ADJUST_CLOCK)) {
-        vmstate_register(NULL, 0, &vmstate_kvmclock, &kvmclock_data);
-    }
-#endif
-
     r = kvm_set_boot_cpu_id(0);
     if (r < 0 && r != -ENOSYS) {
         return r;