summaryrefslogtreecommitdiffstats
path: root/arch/x86/kvm
diff options
context:
space:
mode:
authorLai Jiangshan <laijs@cn.fujitsu.com>2010-12-14 17:57:47 +0800
committerAvi Kivity <avi@redhat.com>2011-01-12 11:30:54 +0200
commita355c85c5f137d93c4e9274c50e26c20f1ebc1c9 (patch)
treed6b3ad0b20436638f21f0f7d4cd13e9b903ad96b /arch/x86/kvm
parent61cfab2e83263ea294a034b12079476a917299f4 (diff)
downloadtalos-op-linux-a355c85c5f137d93c4e9274c50e26c20f1ebc1c9.tar.gz
talos-op-linux-a355c85c5f137d93c4e9274c50e26c20f1ebc1c9.zip
KVM: return true when user space query KVM_CAP_USER_NMI extension
userspace may check this extension in runtime. Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com> Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/x86/kvm')
-rw-r--r--arch/x86/kvm/x86.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 386cab9b5c68..cbaea7dd5963 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -1941,6 +1941,7 @@ int kvm_dev_ioctl_check_extension(long ext)
case KVM_CAP_NOP_IO_DELAY:
case KVM_CAP_MP_STATE:
case KVM_CAP_SYNC_MMU:
+ case KVM_CAP_USER_NMI:
case KVM_CAP_REINJECT_CONTROL:
case KVM_CAP_IRQ_INJECT_STATUS:
case KVM_CAP_ASSIGN_DEV_IRQ:
OpenPOWER on IntegriCloud