From mboxrd@z Thu Jan 1 00:00:00 1970 From: Glauber Costa Subject: [PATCH 3/3] get and set clock upon migration Date: Fri, 16 Oct 2009 15:27:39 -0400 Message-ID: <1255721259-11740-4-git-send-email-glommer@redhat.com> References: <1255721259-11740-1-git-send-email-glommer@redhat.com> <1255721259-11740-2-git-send-email-glommer@redhat.com> <1255721259-11740-3-git-send-email-glommer@redhat.com> Cc: avi@redhat.com To: kvm@vger.kernel.org Return-path: Received: from mx1.redhat.com ([209.132.183.28]:34523 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751348AbZJPT1i (ORCPT ); Fri, 16 Oct 2009 15:27:38 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n9GJRhK1016856 for ; Fri, 16 Oct 2009 15:27:43 -0400 In-Reply-To: <1255721259-11740-3-git-send-email-glommer@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: Register a vmstate handler for kvmclock. The goal here is to pass information about current time to migration, so we avoid going backwards or jumping too much. We use our plain new ioctls for that. Signed-off-by: Glauber Costa --- qemu-kvm-x86.c | 35 +++++++++++++++++++++++++++++++++++ 1 files changed, 35 insertions(+), 0 deletions(-) diff --git a/qemu-kvm-x86.c b/qemu-kvm-x86.c index 693f5b2..909c147 100644 --- a/qemu-kvm-x86.c +++ b/qemu-kvm-x86.c @@ -767,6 +767,37 @@ int kvm_qemu_destroy_memory_alias(uint64_t phys_start) return kvm_destroy_memory_alias(kvm_context, phys_start); } +#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 i; @@ -788,6 +819,10 @@ int kvm_arch_qemu_create_context(void) kvm_has_vm_hsave_pa = 1; } +#ifdef KVM_CAP_ADJUST_CLOCK + if (kvm_check_extension(kvm_state, KVM_CAP_ADJUST_CLOCK)) + vmstate_register(0, &vmstate_kvmclock, &kvmclock_data); +#endif return 0; } -- 1.6.2.2