KVM: s390: add etoken support for guests

[linux.git] / arch / s390 / include / asm / kvm_host.h

diff --git a/arch/s390/include/asm/kvm_host.h b/arch/s390/include/asm/kvm_host.h
index a2188e309bd6faedb524510198ec9671e20494cf..1a7b6834797ec817341ad5f0d691ec4f0e741ab2 100644 (file)
--- a/arch/s390/include/asm/kvm_host.h
+++ b/arch/s390/include/asm/kvm_host.h
@@ -269,6 +269,7 @@ struct kvm_s390_sie_block {
        __u8    reserved1c0[8];         /* 0x01c0 */
 #define ECD_HOSTREGMGMT        0x20000000
 #define ECD_MEF                0x08000000
+#define ECD_ETOKENF    0x02000000
        __u32   ecd;                    /* 0x01c8 */
        __u8    reserved1cc[18];        /* 0x01cc */
        __u64   pp;                     /* 0x01de */
@@ -793,12 +794,6 @@ struct kvm_s390_vsie {
        struct page *pages[KVM_MAX_VCPUS];
 };
 
-struct kvm_s390_migration_state {
-       unsigned long bitmap_size;      /* in bits (number of guest pages) */
-       atomic64_t dirty_pages;         /* number of dirty pages */
-       unsigned long *pgste_bitmap;
-};
-
 struct kvm_arch{
        void *sca;
        int use_esca;
@@ -828,7 +823,8 @@ struct kvm_arch{
        struct kvm_s390_vsie vsie;
        u8 epdx;
        u64 epoch;
-       struct kvm_s390_migration_state *migration_state;
+       int migration_mode;
+       atomic64_t cmma_dirty_pages;
        /* subset of available cpu features enabled by user space */
        DECLARE_BITMAP(cpu_feat, KVM_S390_VM_CPU_FEAT_NR_BITS);
        struct kvm_s390_gisa *gisa;