diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2015-05-20 12:46:12 +0300 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2015-05-20 13:31:37 +0300 |
| commit | a9b4fb7e79e7624c97c55e9c7562e3fe866ce70f (patch) | |
| tree | f690b927077f73993bc7e01c10fc47cce0460b85 /arch/x86/include/asm/kvm_host.h | |
| parent | ed3cf15271fa150320b46f03d369777b71786298 (diff) | |
| parent | c447e76b4cabb49ddae8e49c5758f031f35d55fb (diff) | |
| download | linux-a9b4fb7e79e7624c97c55e9c7562e3fe866ce70f.tar.xz | |
Merge branch 'kvm-master' into kvm-next
Grab MPX bugfix, and fix conflicts against Rik's adaptive FPU
deactivation patch.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/x86/include/asm/kvm_host.h')
| -rw-r--r-- | arch/x86/include/asm/kvm_host.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index bbb8f4e7738a..1a4d6a054749 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -401,6 +401,7 @@ struct kvm_vcpu_arch { struct kvm_mmu_memory_cache mmu_page_header_cache; struct fpu guest_fpu; + bool eager_fpu; u64 xcr0; u64 guest_supported_xcr0; u32 guest_xstate_size; @@ -747,6 +748,7 @@ struct kvm_x86_ops { void (*cache_reg)(struct kvm_vcpu *vcpu, enum kvm_reg reg); unsigned long (*get_rflags)(struct kvm_vcpu *vcpu); void (*set_rflags)(struct kvm_vcpu *vcpu, unsigned long rflags); + void (*fpu_activate)(struct kvm_vcpu *vcpu); void (*fpu_deactivate)(struct kvm_vcpu *vcpu); void (*tlb_flush)(struct kvm_vcpu *vcpu); |