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

Commit f77bc6a4 authored by Zhang Xiantao's avatar Zhang Xiantao Committed by Avi Kivity
Browse files

KVM: Portability: Move KVM_INTERRUPT vcpu ioctl to x86.c 



Other archs doesn't need it.

Signed-off-by: default avatarZhang Xiantao <xiantao.zhang@intel.com>
Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>
parent 018a98db

drivers/kvm/kvm_main.c

+0 −29
Original line number Diff line number Diff line
@@ -665,23 +665,6 @@ void kvm_resched(struct kvm_vcpu *vcpu) 
}

EXPORT_SYMBOL_GPL(kvm_resched);



static int kvm_vcpu_ioctl_interrupt(struct kvm_vcpu *vcpu,

				    struct kvm_interrupt *irq)

{

	if (irq->irq < 0 || irq->irq >= 256)

		return -EINVAL;

	if (irqchip_in_kernel(vcpu->kvm))

		return -ENXIO;

	vcpu_load(vcpu);



	set_bit(irq->irq, vcpu->irq_pending);

	set_bit(irq->irq / BITS_PER_LONG, &vcpu->irq_summary);



	vcpu_put(vcpu);



	return 0;

}



static struct page *kvm_vcpu_nopage(struct vm_area_struct *vma,

				    unsigned long address,

				    int *type)
@@ -883,18 +866,6 @@ static long kvm_vcpu_ioctl(struct file *filp, 
		r = 0;

		break;

	}

	case KVM_INTERRUPT: {

		struct kvm_interrupt irq;



		r = -EFAULT;

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

			goto out;

		r = kvm_vcpu_ioctl_interrupt(vcpu, &irq);

		if (r)

			goto out;

		r = 0;

		break;

	}

	case KVM_DEBUG_GUEST: {

		struct kvm_debug_guest dbg;

drivers/kvm/x86.c

+29 −0
Original line number Diff line number Diff line
@@ -1001,6 +1001,23 @@ static int kvm_vcpu_ioctl_set_lapic(struct kvm_vcpu *vcpu, 
	return 0;

}



static int kvm_vcpu_ioctl_interrupt(struct kvm_vcpu *vcpu,

				    struct kvm_interrupt *irq)

{

	if (irq->irq < 0 || irq->irq >= 256)

		return -EINVAL;

	if (irqchip_in_kernel(vcpu->kvm))

		return -ENXIO;

	vcpu_load(vcpu);



	set_bit(irq->irq, vcpu->irq_pending);

	set_bit(irq->irq / BITS_PER_LONG, &vcpu->irq_summary);



	vcpu_put(vcpu);



	return 0;

}



long kvm_arch_vcpu_ioctl(struct file *filp,

			 unsigned int ioctl, unsigned long arg)

{
@@ -1034,6 +1051,18 @@ long kvm_arch_vcpu_ioctl(struct file *filp, 
		r = 0;

		break;

	}

	case KVM_INTERRUPT: {

		struct kvm_interrupt irq;



		r = -EFAULT;

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

			goto out;

		r = kvm_vcpu_ioctl_interrupt(vcpu, &irq);

		if (r)

			goto out;

		r = 0;

		break;

	}

	case KVM_SET_CPUID: {

		struct kvm_cpuid __user *cpuid_arg = argp;

		struct kvm_cpuid cpuid;