Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cbc0236a authored by Roman Kagan's avatar Roman Kagan Committed by Radim Krčmář
Browse files

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: default avatarRoman Kagan <rkagan@virtuozzo.com>
Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Signed-off-by: default avatarRadim Krčmář <rkrcmar@redhat.com>
parent 661e50bc

arch/x86/kvm/hyperv.c

+9 −0
Original line number Diff line number Diff line
@@ -1301,3 +1301,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)

{

}

arch/x86/kvm/hyperv.h

+3 −0
Original line number Diff line number Diff line
@@ -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

arch/x86/kvm/x86.c

+2 −1
Original line number Diff line number Diff line
@@ -8447,7 +8447,6 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type) 


	raw_spin_lock_init(&kvm->arch.tsc_write_lock);

	mutex_init(&kvm->arch.apic_map_lock);

	mutex_init(&kvm->arch.hyperv.hv_lock);

	spin_lock_init(&kvm->arch.pvclock_gtod_sync_lock);



	kvm->arch.kvmclock_offset = -ktime_get_boot_ns();
@@ -8456,6 +8455,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);
@@ -8586,6 +8586,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,