[Devel] [PATCH RHEL7 COMMIT] kvm: x86: factor out kvm.arch.hyperv (de)init

[Konstantin Khorenko]

The commit is pushed to "branch-rh7-3.10.0-693.21.1.vz7.47.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-693.21.1.vz7.47.2
------>
commit cf304e08e71d77324720a3fc755fc0f6fe74e16e
Author: Roman Kagan <rkagan at virtuozzo.com>
Date:   Fri Apr 27 13:34:51 2018 +0300

    kvm: x86: factor out kvm.arch.hyperv (de)init
    
    Move kvm.arch.hyperv initialization and cleanup to separate functions.
    
    For now only a mutex is inited in the former, and the latter is empty;
    more stuff will go in there in a followup patch.
    
    Signed-off-by: Roman Kagan <rkagan at virtuozzo.com>
    
    Reviewed-by: David Hildenbrand <david at redhat.com>
    Signed-off-by: Radim Krčmář <rkrcmar at redhat.com>
    (cherry picked from commit cbc0236a4b3e6a64f5b8bee27b530c7f8bee8d56)
---
 arch/x86/kvm/hyperv.c | 9 +++++++++
 arch/x86/kvm/hyperv.h | 3 +++
 arch/x86/kvm/x86.c    | 2 ++
 3 files changed, 14 insertions(+)

diff --git a/arch/x86/kvm/hyperv.c b/arch/x86/kvm/hyperv.c
index 380e238cac7e..692ae19d2d72 100644
--- a/arch/x86/kvm/hyperv.c
+++ b/arch/x86/kvm/hyperv.c
@@ -1289,3 +1289,12 @@ int kvm_hv_hypercall(struct kvm_vcpu *vcpu)
 	kvm_hv_hypercall_set_result(vcpu, ret);
 	return 1;
 }
+
+void kvm_hv_init_vm(struct kvm *kvm)
+{
+	mutex_init(&kvm->arch.hyperv.hv_lock);
+}
+
+void kvm_hv_destroy_vm(struct kvm *kvm)
+{
+}
diff --git a/arch/x86/kvm/hyperv.h b/arch/x86/kvm/hyperv.h
index e637631a9574..cc2468244ca2 100644
--- a/arch/x86/kvm/hyperv.h
+++ b/arch/x86/kvm/hyperv.h
@@ -88,4 +88,7 @@ void kvm_hv_process_stimers(struct kvm_vcpu *vcpu);
 void kvm_hv_setup_tsc_page(struct kvm *kvm,
 			   struct pvclock_vcpu_time_info *hv_clock);
 
+void kvm_hv_init_vm(struct kvm *kvm);
+void kvm_hv_destroy_vm(struct kvm *kvm);
+
 #endif
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 265ca677257f..31d84499a3da 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -7884,6 +7884,7 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type)
 	INIT_DELAYED_WORK(&kvm->arch.kvmclock_update_work, kvmclock_update_fn);
 	INIT_DELAYED_WORK(&kvm->arch.kvmclock_sync_work, kvmclock_sync_fn);
 
+	kvm_hv_init_vm(kvm);
 	kvm_page_track_init(kvm);
 	kvm_mmu_init_vm(kvm);
 
@@ -8020,6 +8021,7 @@ void kvm_arch_destroy_vm(struct kvm *kvm)
 	kvfree(rcu_dereference_check(kvm->arch.apic_map, 1));
 	kvm_mmu_uninit_vm(kvm);
 	kvm_page_track_cleanup(kvm);
+	kvm_hv_destroy_vm(kvm);
 }
 
 void kvm_arch_free_memslot(struct kvm *kvm, struct kvm_memory_slot *free,