Merge tag 'kvm-s390-next-5.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.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 611f18e..bf1ab06 100644 (file)
--- a/arch/s390/include/asm/kvm_host.h
+++ b/arch/s390/include/asm/kvm_host.h
@@ -362,6 +362,7 @@ struct sie_page {
 };
 
 struct kvm_vcpu_stat {
+       struct kvm_vcpu_stat_generic generic;
        u64 exit_userspace;
        u64 exit_null;
        u64 exit_external_request;
@@ -371,13 +372,7 @@ struct kvm_vcpu_stat {
        u64 exit_validity;
        u64 exit_instruction;
        u64 exit_pei;
-       u64 halt_successful_poll;
-       u64 halt_attempted_poll;
-       u64 halt_poll_invalid;
        u64 halt_no_poll_steal;
-       u64 halt_wakeup;
-       u64 halt_poll_success_ns;
-       u64 halt_poll_fail_ns;
        u64 instruction_lctl;
        u64 instruction_lctlg;
        u64 instruction_stctl;
@@ -451,15 +446,15 @@ struct kvm_vcpu_stat {
        u64 instruction_sigp_init_cpu_reset;
        u64 instruction_sigp_cpu_reset;
        u64 instruction_sigp_unknown;
-       u64 diagnose_10;
-       u64 diagnose_44;
-       u64 diagnose_9c;
-       u64 diagnose_9c_ignored;
-       u64 diagnose_9c_forward;
-       u64 diagnose_258;
-       u64 diagnose_308;
-       u64 diagnose_500;
-       u64 diagnose_other;
+       u64 instruction_diagnose_10;
+       u64 instruction_diagnose_44;
+       u64 instruction_diagnose_9c;
+       u64 diag_9c_ignored;
+       u64 diag_9c_forward;
+       u64 instruction_diagnose_258;
+       u64 instruction_diagnose_308;
+       u64 instruction_diagnose_500;
+       u64 instruction_diagnose_other;
        u64 pfault_sync;
 };
 
@@ -756,12 +751,12 @@ struct kvm_vcpu_arch {
 };
 
 struct kvm_vm_stat {
+       struct kvm_vm_stat_generic generic;
        u64 inject_io;
        u64 inject_float_mchk;
        u64 inject_pfault_done;
        u64 inject_service_signal;
        u64 inject_virtio;
-       u64 remote_tlb_flush;
 };
 
 struct kvm_arch_memory_slot {