Merge branch 'kvm-5.16-fixes' into kvm-master

[sfrench/cifs-2.6.git] / arch / x86 / include / asm / kvm_host.h

diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
index 33e3292233f353f422676319619a4d1d69d81e5e..e5d8700319cc08e99b4058569f8015fb345ad7de 100644 (file)
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -688,18 +688,18 @@ struct kvm_vcpu_arch {
         *
         * Note that while the PKRU state lives inside the fpu registers,
         * it is switched out separately at VMENTER and VMEXIT time. The
-        * "guest_fpu" state here contains the guest FPU context, with the
+        * "guest_fpstate" state here contains the guest FPU context, with the
         * host PRKU bits.
         */
-       struct fpu *user_fpu;
-       struct fpu *guest_fpu;
+       struct fpu_guest guest_fpu;
 
        u64 xcr0;
        u64 guest_supported_xcr0;
 
        struct kvm_pio_request pio;
        void *pio_data;
-       void *guest_ins_data;
+       void *sev_pio_data;
+       unsigned sev_pio_count;
 
        u8 event_exit_inst_len;
 
@@ -1477,6 +1477,7 @@ struct kvm_x86_ops {
        int (*mem_enc_reg_region)(struct kvm *kvm, struct kvm_enc_region *argp);
        int (*mem_enc_unreg_region)(struct kvm *kvm, struct kvm_enc_region *argp);
        int (*vm_copy_enc_context_from)(struct kvm *kvm, unsigned int source_fd);
+       int (*vm_move_enc_context_from)(struct kvm *kvm, unsigned int source_fd);
 
        int (*get_msr_feature)(struct kvm_msr_entry *entry);
 
@@ -1699,8 +1700,6 @@ void kvm_vcpu_deliver_sipi_vector(struct kvm_vcpu *vcpu, u8 vector);
 int kvm_task_switch(struct kvm_vcpu *vcpu, u16 tss_selector, int idt_index,
                    int reason, bool has_error_code, u32 error_code);
 
-void kvm_free_guest_fpu(struct kvm_vcpu *vcpu);
-
 void kvm_post_set_cr0(struct kvm_vcpu *vcpu, unsigned long old_cr0, unsigned long cr0);
 void kvm_post_set_cr4(struct kvm_vcpu *vcpu, unsigned long old_cr4, unsigned long cr4);
 int kvm_set_cr0(struct kvm_vcpu *vcpu, unsigned long cr0);