|
@@ -397,7 +397,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,
|
|
|
|
|
|
int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run)
|
|
|
{
|
|
|
- int r = 0;
|
|
|
+ int r = -EINTR;
|
|
|
sigset_t sigsaved;
|
|
|
|
|
|
if (vcpu->sigset_active)
|
|
@@ -409,6 +409,9 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run)
|
|
|
vcpu->mmio_needed = 0;
|
|
|
}
|
|
|
|
|
|
+ if (run->immediate_exit)
|
|
|
+ goto out;
|
|
|
+
|
|
|
lose_fpu(1);
|
|
|
|
|
|
local_irq_disable();
|
|
@@ -429,6 +432,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run)
|
|
|
guest_exit_irqoff();
|
|
|
local_irq_enable();
|
|
|
|
|
|
+out:
|
|
|
if (vcpu->sigset_active)
|
|
|
sigprocmask(SIG_SETMASK, &sigsaved, NULL);
|
|
|
|
|
@@ -1021,6 +1025,7 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)
|
|
|
case KVM_CAP_ENABLE_CAP:
|
|
|
case KVM_CAP_READONLY_MEM:
|
|
|
case KVM_CAP_SYNC_MMU:
|
|
|
+ case KVM_CAP_IMMEDIATE_EXIT:
|
|
|
r = 1;
|
|
|
break;
|
|
|
case KVM_CAP_COALESCED_MMIO:
|