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

Commit 1af1ac91 authored by David Hildenbrand's avatar David Hildenbrand Committed by Paolo Bonzini
Browse files

KVM: x86: allow setting identity map addr with no vcpus only 



Changing it afterwards doesn't make too much sense and will only result
in inconsistencies.

Reviewed-by: default avatarRadim Krčmář <rkrcmar@redhat.com>
Signed-off-by: default avatarDavid Hildenbrand <david@redhat.com>
Signed-off-by: default avatarRadim Krčmář <rkrcmar@redhat.com>
parent 726b99c4

Documentation/virtual/kvm/api.txt

+1 −0
Original line number Diff line number Diff line
@@ -1131,6 +1131,7 @@ This ioctl is required on Intel-based hosts. This is needed on Intel hardware 
because of a quirk in the virtualization implementation (see the internals

documentation when it pops into existence).



Fails if any VCPU has already been created.



4.41 KVM_SET_BOOT_CPU_ID

arch/x86/kvm/x86.c

+7 −1
Original line number Diff line number Diff line
@@ -4034,10 +4034,16 @@ long kvm_arch_vm_ioctl(struct file *filp, 
	case KVM_SET_IDENTITY_MAP_ADDR: {

		u64 ident_addr;



		mutex_lock(&kvm->lock);

		r = -EINVAL;

		if (kvm->created_vcpus)

			goto set_identity_unlock;

		r = -EFAULT;

		if (copy_from_user(&ident_addr, argp, sizeof ident_addr))

			goto out;

			goto set_identity_unlock;

		r = kvm_vm_ioctl_set_identity_map_addr(kvm, ident_addr);

set_identity_unlock:

		mutex_unlock(&kvm->lock);

		break;

	}

	case KVM_SET_NR_MMU_PAGES: