From: Avi Kivity <[email protected]>
Signed-off-by: Avi Kivity <[email protected]>
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index f85f0e3..3e57be4 100644
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -581,12 +581,13 @@ static inline bool kvm_vcpu_is_bsp(struct kvm_vcpu *vcpu)
#ifdef __KVM_HAVE_DEVICE_ASSIGNMENT
-long kvm_assigned_dev_ioctl(struct kvm *kvm, unsigned ioctl, unsigned long
arg);
+long kvm_vm_ioctl_assigned_device(struct kvm *kvm, unsigned ioctl,
+ unsigned long arg);
#else
-static inline
-long kvm_assigned_dev_ioctl(struct kvm *kvm, unsigned ioctl, unsigned long arg)
+static inline long kvm_vm_ioctl_assigned_device(struct kvm *kvm, unsigned
ioctl,
+ unsigned long arg)
{
return -ENOTTY;
}
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 891ad91..c7563f6 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -1491,7 +1491,7 @@ static long kvm_vm_ioctl(struct file *filp,
default:
r = kvm_arch_vm_ioctl(filp, ioctl, arg);
if (r == -ENOTTY)
- r = kvm_assigned_dev_ioctl(kvm, ioctl, arg);
+ r = kvm_vm_ioctl_assigned_device(kvm, ioctl, arg);
}
out:
return r;
--
To unsubscribe from this list: send the line "unsubscribe kvm-commits" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
