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

Commit 6da64fdb authored by Thomas Meyer's avatar Thomas Meyer Committed by Avi Kivity
Browse files

KVM: Use kmemdup rather than duplicating its implementation 

 Use kmemdup rather than duplicating its implementation

 The semantic patch that makes this change is available
 in scripts/coccinelle/api/memdup.cocci.

 More information about semantic patching is available at
 http://coccinelle.lip6.fr/



Signed-off-by: default avatarThomas Meyer <thomas@m3y3r.de>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent fb920458

virt/kvm/kvm_main.c

+5 −6
Original line number Diff line number Diff line
@@ -775,10 +775,10 @@ int __kvm_set_memory_region(struct kvm *kvm, 


	if (!npages) {

		r = -ENOMEM;

		slots = kzalloc(sizeof(struct kvm_memslots), GFP_KERNEL);

		slots = kmemdup(kvm->memslots, sizeof(struct kvm_memslots),

				GFP_KERNEL);

		if (!slots)

			goto out_free;

		memcpy(slots, kvm->memslots, sizeof(struct kvm_memslots));

		if (mem->slot >= slots->nmemslots)

			slots->nmemslots = mem->slot + 1;

		slots->generation++;
@@ -810,10 +810,10 @@ int __kvm_set_memory_region(struct kvm *kvm, 
	}



	r = -ENOMEM;

	slots = kzalloc(sizeof(struct kvm_memslots), GFP_KERNEL);

	slots = kmemdup(kvm->memslots, sizeof(struct kvm_memslots),

			GFP_KERNEL);

	if (!slots)

		goto out_free;

	memcpy(slots, kvm->memslots, sizeof(struct kvm_memslots));

	if (mem->slot >= slots->nmemslots)

		slots->nmemslots = mem->slot + 1;

	slots->generation++;
@@ -2520,10 +2520,9 @@ int kvm_io_bus_register_dev(struct kvm *kvm, enum kvm_bus bus_idx, gpa_t addr, 
	if (bus->dev_count > NR_IOBUS_DEVS-1)

		return -ENOSPC;



	new_bus = kzalloc(sizeof(struct kvm_io_bus), GFP_KERNEL);

	new_bus = kmemdup(bus, sizeof(struct kvm_io_bus), GFP_KERNEL);

	if (!new_bus)

		return -ENOMEM;

	memcpy(new_bus, bus, sizeof(struct kvm_io_bus));

	kvm_io_bus_insert_dev(new_bus, dev, addr, len);

	rcu_assign_pointer(kvm->buses[bus_idx], new_bus);

	synchronize_srcu_expedited(&kvm->srcu);