Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1716857

[PATCH RFC v3 5/9] KVM: remove unused __KVM_HAVE_ARCH_VM_ALLOC

Show all headers | View raw

Moving it to generic code will allow us to extend it with ease.
Christian noted that it was only used in the removed ia64.

Reviewed-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
---
 include/linux/kvm_host.h | 12 ------------
 virt/kvm/kvm_main.c      | 16 +++++++++++++---
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index a8ff956616d2..abd5cb1feb9e 100644
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -798,18 +798,6 @@ int kvm_arch_vcpu_runnable(struct kvm_vcpu *vcpu);
 bool kvm_arch_vcpu_in_kernel(struct kvm_vcpu *vcpu);
 int kvm_arch_vcpu_should_kick(struct kvm_vcpu *vcpu);
 
-#ifndef __KVM_HAVE_ARCH_VM_ALLOC
-static inline struct kvm *kvm_arch_alloc_vm(void)
-{
-	return kzalloc(sizeof(struct kvm), GFP_KERNEL);
-}
-
-static inline void kvm_arch_free_vm(struct kvm *kvm)
-{
-	kfree(kvm);
-}
-#endif
-
 #ifdef __KVM_HAVE_ARCH_NONCOHERENT_DMA
 void kvm_arch_register_noncoherent_dma(struct kvm *kvm);
 void kvm_arch_unregister_noncoherent_dma(struct kvm *kvm);
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index caf8323f7df7..d89261d0d8c6 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -640,10 +640,20 @@ static int kvm_create_vm_debugfs(struct kvm *kvm, int fd)
 	return 0;
 }
 
+static inline struct kvm *kvm_alloc_vm(void)
+{
+	return kzalloc(sizeof(struct kvm), GFP_KERNEL);
+}
+
+static inline void kvm_free_vm(struct kvm *kvm)
+{
+	kfree(kvm);
+}
+
 static struct kvm *kvm_create_vm(unsigned long type)
 {
 	int r, i;
-	struct kvm *kvm = kvm_arch_alloc_vm();
+	struct kvm *kvm = kvm_alloc_vm();
 
 	if (!kvm)
 		return ERR_PTR(-ENOMEM);
@@ -720,7 +730,7 @@ static struct kvm *kvm_create_vm(unsigned long type)
 		kfree(kvm_get_bus(kvm, i));
 	for (i = 0; i < KVM_ADDRESS_SPACE_NUM; i++)
 		kvm_free_memslots(kvm, __kvm_memslots(kvm, i));
-	kvm_arch_free_vm(kvm);
+	kvm_free_vm(kvm);
 	mmdrop(current->mm);
 	return ERR_PTR(r);
 }
@@ -771,7 +781,7 @@ static void kvm_destroy_vm(struct kvm *kvm)
 		kvm_free_memslots(kvm, __kvm_memslots(kvm, i));
 	cleanup_srcu_struct(&kvm->irq_srcu);
 	cleanup_srcu_struct(&kvm->srcu);
-	kvm_arch_free_vm(kvm);
+	kvm_free_vm(kvm);
 	preempt_notifier_dec();
 	hardware_disable_all();
 	mmdrop(mm);
-- 
2.13.3

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH RFC v3 0/9] KVM: allow dynamic kvm->vcpus array Radim Krčmář <rkrcmar@redhat.com> - 2017-08-21 22:40 +0200
  [PATCH RFC v3 6/9] KVM: rework kvm_vcpu_on_spin loop Radim Krčmář <rkrcmar@redhat.com> - 2017-08-21 22:40 +0200
    Re: [PATCH RFC v3 6/9] KVM: rework kvm_vcpu_on_spin loop David Hildenbrand <david@redhat.com> - 2017-08-22 16:10 +0200
  [PATCH RFC v3 5/9] KVM: remove unused __KVM_HAVE_ARCH_VM_ALLOC Radim Krčmář <rkrcmar@redhat.com> - 2017-08-21 22:40 +0200
  [PATCH RFC v3 1/9] KVM: s390: optimize detection of started vcpus Radim Krčmář <rkrcmar@redhat.com> - 2017-08-21 22:40 +0200
    Re: [PATCH RFC v3 1/9] KVM: s390: optimize detection of started vcpus Christian Borntraeger <borntraeger@de.ibm.com> - 2017-08-22 09:30 +0200
    Re: [PATCH RFC v3 1/9] KVM: s390: optimize detection of started vcpus David Hildenbrand <david@redhat.com> - 2017-08-22 13:40 +0200
  [PATCH RFC v3 2/9] KVM: arm/arm64: fix vcpu self-detection in vgic_v3_dispatch_sgi() Radim Krčmář <rkrcmar@redhat.com> - 2017-08-21 22:40 +0200
    Re: [PATCH RFC v3 2/9] KVM: arm/arm64: fix vcpu self-detection in  vgic_v3_dispatch_sgi() David Hildenbrand <david@redhat.com> - 2017-08-22 13:50 +0200
  [PATCH RFC v3 7/9] KVM: add kvm_free_vcpus and kvm_arch_free_vcpus Radim Krčmář <rkrcmar@redhat.com> - 2017-08-21 22:40 +0200
    Re: [PATCH RFC v3 7/9] KVM: add kvm_free_vcpus and  kvm_arch_free_vcpus David Hildenbrand <david@redhat.com> - 2017-08-22 16:20 +0200
  [PATCH RFC v3 4/9] KVM: arm/arm64: use locking helpers in kvm_vgic_create() Radim Krčmář <rkrcmar@redhat.com> - 2017-08-21 22:40 +0200
    Re: [PATCH RFC v3 4/9] KVM: arm/arm64: use locking helpers in  kvm_vgic_create() David Hildenbrand <david@redhat.com> - 2017-08-22 14:00 +0200
  [PATCH RFC v3 3/9] KVM: remember position in kvm->vcpus array Radim Krčmář <rkrcmar@redhat.com> - 2017-08-21 22:50 +0200
    Re: [PATCH RFC v3 3/9] KVM: remember position in kvm->vcpus array David Hildenbrand <david@redhat.com> - 2017-08-22 13:50 +0200

csiph-web