diff options
author | Eric B Munson <emunson@mgebm.net> | 2012-03-10 14:37:27 -0500 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2012-04-08 05:49:01 -0400 |
commit | 1c0b28c2a46d98cd258d96b8c222144b22876c46 (patch) | |
tree | 68c5b4f6a74e3b245dd994752fdc9005075b485c /arch/x86 | |
parent | 3b5d56b9317fa7b5407dff1aa7b115bf6cdbd494 (diff) |
KVM: x86: Add ioctl for KVM_KVMCLOCK_CTRL
Now that we have a flag that will tell the guest it was suspended, create an
interface for that communication using a KVM ioctl.
Signed-off-by: Eric B Munson <emunson@mgebm.net>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/kvm/x86.c | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 511031dcb9cc..99b738028fc0 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c | |||
@@ -2147,6 +2147,7 @@ int kvm_dev_ioctl_check_extension(long ext) | |||
2147 | case KVM_CAP_ASYNC_PF: | 2147 | case KVM_CAP_ASYNC_PF: |
2148 | case KVM_CAP_GET_TSC_KHZ: | 2148 | case KVM_CAP_GET_TSC_KHZ: |
2149 | case KVM_CAP_PCI_2_3: | 2149 | case KVM_CAP_PCI_2_3: |
2150 | case KVM_CAP_KVMCLOCK_CTRL: | ||
2150 | r = 1; | 2151 | r = 1; |
2151 | break; | 2152 | break; |
2152 | case KVM_CAP_COALESCED_MMIO: | 2153 | case KVM_CAP_COALESCED_MMIO: |
@@ -2597,6 +2598,23 @@ static int kvm_vcpu_ioctl_x86_set_xcrs(struct kvm_vcpu *vcpu, | |||
2597 | return r; | 2598 | return r; |
2598 | } | 2599 | } |
2599 | 2600 | ||
2601 | /* | ||
2602 | * kvm_set_guest_paused() indicates to the guest kernel that it has been | ||
2603 | * stopped by the hypervisor. This function will be called from the host only. | ||
2604 | * EINVAL is returned when the host attempts to set the flag for a guest that | ||
2605 | * does not support pv clocks. | ||
2606 | */ | ||
2607 | static int kvm_set_guest_paused(struct kvm_vcpu *vcpu) | ||
2608 | { | ||
2609 | struct pvclock_vcpu_time_info *src = &vcpu->arch.hv_clock; | ||
2610 | if (!vcpu->arch.time_page) | ||
2611 | return -EINVAL; | ||
2612 | src->flags |= PVCLOCK_GUEST_STOPPED; | ||
2613 | mark_page_dirty(vcpu->kvm, vcpu->arch.time >> PAGE_SHIFT); | ||
2614 | kvm_make_request(KVM_REQ_CLOCK_UPDATE, vcpu); | ||
2615 | return 0; | ||
2616 | } | ||
2617 | |||
2600 | long kvm_arch_vcpu_ioctl(struct file *filp, | 2618 | long kvm_arch_vcpu_ioctl(struct file *filp, |
2601 | unsigned int ioctl, unsigned long arg) | 2619 | unsigned int ioctl, unsigned long arg) |
2602 | { | 2620 | { |
@@ -2873,6 +2891,10 @@ long kvm_arch_vcpu_ioctl(struct file *filp, | |||
2873 | r = vcpu->arch.virtual_tsc_khz; | 2891 | r = vcpu->arch.virtual_tsc_khz; |
2874 | goto out; | 2892 | goto out; |
2875 | } | 2893 | } |
2894 | case KVM_KVMCLOCK_CTRL: { | ||
2895 | r = kvm_set_guest_paused(vcpu); | ||
2896 | goto out; | ||
2897 | } | ||
2876 | default: | 2898 | default: |
2877 | r = -EINVAL; | 2899 | r = -EINVAL; |
2878 | } | 2900 | } |