Switch kvm__register_mem() and kvm__destroy_mem() from kvm_userspace_memory_region to kvm_userspace_memory_region2 and KVM_SET_USER_MEMORY_REGION2 unconditionally. The v2 struct is a superset; when the extra fields are zero, the ioctl behaves identically to v1. This prepares for adding guest_memfd support. Signed-off-by: Fuad Tabba --- kvm.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/kvm.c b/kvm.c index 95ccfcb..8a7fd09 100644 --- a/kvm.c +++ b/kvm.c @@ -189,7 +189,7 @@ core_exit(kvm__exit); int kvm__destroy_mem(struct kvm *kvm, u64 guest_phys, u64 size, void *userspace_addr) { - struct kvm_userspace_memory_region mem; + struct kvm_userspace_memory_region2 mem; struct kvm_mem_bank *bank; int ret; @@ -213,14 +213,14 @@ int kvm__destroy_mem(struct kvm *kvm, u64 guest_phys, u64 size, goto out; } - mem = (struct kvm_userspace_memory_region) { + mem = (struct kvm_userspace_memory_region2) { .slot = bank->slot, .guest_phys_addr = guest_phys, .memory_size = 0, .userspace_addr = (unsigned long)userspace_addr, }; - ret = ioctl(kvm->vm_fd, KVM_SET_USER_MEMORY_REGION, &mem); + ret = ioctl(kvm->vm_fd, KVM_SET_USER_MEMORY_REGION2, &mem); if (ret < 0) { ret = -errno; goto out; @@ -239,7 +239,6 @@ out: int kvm__register_mem(struct kvm *kvm, u64 guest_phys, u64 size, void *userspace_addr, enum kvm_mem_type type) { - struct kvm_userspace_memory_region mem; struct kvm_mem_bank *merged = NULL; struct kvm_mem_bank *bank; struct list_head *prev_entry; @@ -320,7 +319,7 @@ int kvm__register_mem(struct kvm *kvm, u64 guest_phys, u64 size, flags |= KVM_MEM_READONLY; if (type != KVM_MEM_TYPE_RESERVED) { - mem = (struct kvm_userspace_memory_region) { + struct kvm_userspace_memory_region2 mem = { .slot = slot, .flags = flags, .guest_phys_addr = guest_phys, @@ -328,7 +327,7 @@ int kvm__register_mem(struct kvm *kvm, u64 guest_phys, u64 size, .userspace_addr = (unsigned long)userspace_addr, }; - ret = ioctl(kvm->vm_fd, KVM_SET_USER_MEMORY_REGION, &mem); + ret = ioctl(kvm->vm_fd, KVM_SET_USER_MEMORY_REGION2, &mem); if (ret < 0) { ret = -errno; goto out; -- 2.39.5