Commit d19a9cd2 authored by Zhang Xiantao's avatar Zhang Xiantao Committed by Avi Kivity
Browse files

KVM: Portability: Add two hooks to handle kvm_create and destroy vm 



Add two arch hooks to handle kvm_create_vm and kvm destroy_vm. Now, just
put io_bus init and destory in common.

Signed-off-by: default avatarZhang Xiantao <xiantao.zhang@intel.com>
Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>
parent a16b043c

drivers/kvm/kvm.h

+4 −0
Original line number Diff line number Diff line
@@ -674,6 +674,10 @@ int kvm_arch_hardware_setup(void); 
void kvm_arch_hardware_unsetup(void);

void kvm_arch_check_processor_compat(void *rtn);



void kvm_free_physmem(struct kvm *kvm);



struct  kvm *kvm_arch_create_vm(void);

void kvm_arch_destroy_vm(struct kvm *kvm);



static inline void kvm_guest_enter(void)

{

drivers/kvm/kvm_main.c

+6 −36
Original line number Diff line number Diff line
@@ -156,18 +156,18 @@ EXPORT_SYMBOL_GPL(kvm_vcpu_uninit); 


static struct kvm *kvm_create_vm(void)

{

	struct kvm *kvm = kzalloc(sizeof(struct kvm), GFP_KERNEL);

	struct kvm *kvm = kvm_arch_create_vm();



	if (!kvm)

		return ERR_PTR(-ENOMEM);

	if (IS_ERR(kvm))

		goto out;



	kvm_io_bus_init(&kvm->pio_bus);

	mutex_init(&kvm->lock);

	INIT_LIST_HEAD(&kvm->active_mmu_pages);

	kvm_io_bus_init(&kvm->mmio_bus);

	spin_lock(&kvm_lock);

	list_add(&kvm->vm_list, &vm_list);

	spin_unlock(&kvm_lock);

out:

	return kvm;

}
@@ -188,7 +188,7 @@ static void kvm_free_physmem_slot(struct kvm_memory_slot *free, 
	free->rmap = NULL;

}



static void kvm_free_physmem(struct kvm *kvm)

void kvm_free_physmem(struct kvm *kvm)

{

	int i;
@@ -196,32 +196,6 @@ static void kvm_free_physmem(struct kvm *kvm) 
		kvm_free_physmem_slot(&kvm->memslots[i], NULL);

}



static void kvm_unload_vcpu_mmu(struct kvm_vcpu *vcpu)

{

	vcpu_load(vcpu);

	kvm_mmu_unload(vcpu);

	vcpu_put(vcpu);

}



static void kvm_free_vcpus(struct kvm *kvm)

{

	unsigned int i;



	/*

	 * Unpin any mmu pages first.

	 */

	for (i = 0; i < KVM_MAX_VCPUS; ++i)

		if (kvm->vcpus[i])

			kvm_unload_vcpu_mmu(kvm->vcpus[i]);

	for (i = 0; i < KVM_MAX_VCPUS; ++i) {

		if (kvm->vcpus[i]) {

			kvm_arch_vcpu_free(kvm->vcpus[i]);

			kvm->vcpus[i] = NULL;

		}

	}



}



static void kvm_destroy_vm(struct kvm *kvm)

{

	spin_lock(&kvm_lock);
@@ -229,11 +203,7 @@ static void kvm_destroy_vm(struct kvm *kvm) 
	spin_unlock(&kvm_lock);

	kvm_io_bus_destroy(&kvm->pio_bus);

	kvm_io_bus_destroy(&kvm->mmio_bus);

	kfree(kvm->vpic);

	kfree(kvm->vioapic);

	kvm_free_vcpus(kvm);

	kvm_free_physmem(kvm);

	kfree(kvm);

	kvm_arch_destroy_vm(kvm);

}



static int kvm_vm_release(struct inode *inode, struct file *filp)

drivers/kvm/x86.c

+47 −0
Original line number Diff line number Diff line
@@ -2543,3 +2543,50 @@ void kvm_arch_vcpu_uninit(struct kvm_vcpu *vcpu) 
	kvm_mmu_destroy(vcpu);

	free_page((unsigned long)vcpu->pio_data);

}



struct  kvm *kvm_arch_create_vm(void)

{

	struct kvm *kvm = kzalloc(sizeof(struct kvm), GFP_KERNEL);



	if (!kvm)

		return ERR_PTR(-ENOMEM);



	INIT_LIST_HEAD(&kvm->active_mmu_pages);



	return kvm;

}



static void kvm_unload_vcpu_mmu(struct kvm_vcpu *vcpu)

{

	vcpu_load(vcpu);

	kvm_mmu_unload(vcpu);

	vcpu_put(vcpu);

}



static void kvm_free_vcpus(struct kvm *kvm)

{

	unsigned int i;



	/*

	 * Unpin any mmu pages first.

	 */

	for (i = 0; i < KVM_MAX_VCPUS; ++i)

		if (kvm->vcpus[i])

			kvm_unload_vcpu_mmu(kvm->vcpus[i]);

	for (i = 0; i < KVM_MAX_VCPUS; ++i) {

		if (kvm->vcpus[i]) {

			kvm_arch_vcpu_free(kvm->vcpus[i]);

			kvm->vcpus[i] = NULL;

		}

	}



}



void kvm_arch_destroy_vm(struct kvm *kvm)

{

	kfree(kvm->vpic);

	kfree(kvm->vioapic);

	kvm_free_vcpus(kvm);

	kvm_free_physmem(kvm);

	kfree(kvm);

}