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

Commit a4770347 authored by Rusty Russell's avatar Rusty Russell Committed by Avi Kivity
Browse files

KVM: Use kmem_cache_free for kmem_cache_zalloc'ed objects 



We use kfree in svm.c and vmx.c, and this works, but it could break at
any time.  kfree() is supposed to match up with kmalloc().

Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>
parent f0242478

drivers/kvm/svm.c

+2 −2
Original line number Diff line number Diff line
@@ -610,7 +610,7 @@ static struct kvm_vcpu *svm_create_vcpu(struct kvm *kvm, unsigned int id) 
uninit:

	kvm_vcpu_uninit(&svm->vcpu);

free_svm:

	kfree(svm);

	kmem_cache_free(kvm_vcpu_cache, svm);

out:

	return ERR_PTR(err);

}
@@ -621,7 +621,7 @@ static void svm_free_vcpu(struct kvm_vcpu *vcpu) 


	__free_page(pfn_to_page(svm->vmcb_pa >> PAGE_SHIFT));

	kvm_vcpu_uninit(vcpu);

	kfree(svm);

	kmem_cache_free(kvm_vcpu_cache, svm);

}



static void svm_vcpu_load(struct kvm_vcpu *vcpu, int cpu)

drivers/kvm/vmx.c

+2 −2
Original line number Diff line number Diff line
@@ -2359,7 +2359,7 @@ static void vmx_free_vcpu(struct kvm_vcpu *vcpu) 
	kfree(vmx->host_msrs);

	kfree(vmx->guest_msrs);

	kvm_vcpu_uninit(vcpu);

	kfree(vmx);

	kmem_cache_free(kvm_vcpu_cache, vmx);

}



static struct kvm_vcpu *vmx_create_vcpu(struct kvm *kvm, unsigned int id)
@@ -2410,7 +2410,7 @@ static struct kvm_vcpu *vmx_create_vcpu(struct kvm *kvm, unsigned int id) 
uninit_vcpu:

	kvm_vcpu_uninit(&vmx->vcpu);

free_vcpu:

	kfree(vmx);

	kmem_cache_free(kvm_vcpu_cache, vmx);

	return ERR_PTR(err);

}