diff options
author | Alex Williamson <alex.williamson@redhat.com> | 2013-04-16 13:49:18 -0600 |
---|---|---|
committer | Gleb Natapov <gleb@redhat.com> | 2013-04-28 12:58:56 +0300 |
commit | 2a5bab1004729f3302c776e53ee7c895b98bb1ce (patch) | |
tree | 281519b89e9f766a3d83c6978850e9eb72b3e0df /arch/x86/kvm/x86.c | |
parent | 064d1afaa5a60fc391d0b4b77599fc8f63f99cd3 (diff) | |
download | linux-3.10-2a5bab1004729f3302c776e53ee7c895b98bb1ce.tar.gz linux-3.10-2a5bab1004729f3302c776e53ee7c895b98bb1ce.tar.bz2 linux-3.10-2a5bab1004729f3302c776e53ee7c895b98bb1ce.zip |
kvm: Allow build-time configuration of KVM device assignment
We hope to at some point deprecate KVM legacy device assignment in
favor of VFIO-based assignment. Towards that end, allow legacy
device assignment to be deconfigured.
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Reviewed-by: Alexander Graf <agraf@suse.de>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Gleb Natapov <gleb@redhat.com>
Diffstat (limited to 'arch/x86/kvm/x86.c')
-rw-r--r-- | arch/x86/kvm/x86.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 145b1c81011..8747fef7fd5 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -2501,7 +2501,6 @@ int kvm_dev_ioctl_check_extension(long ext) case KVM_CAP_USER_NMI: case KVM_CAP_REINJECT_CONTROL: case KVM_CAP_IRQ_INJECT_STATUS: - case KVM_CAP_ASSIGN_DEV_IRQ: case KVM_CAP_IRQFD: case KVM_CAP_IOEVENTFD: case KVM_CAP_PIT2: @@ -2519,9 +2518,12 @@ int kvm_dev_ioctl_check_extension(long ext) case KVM_CAP_XSAVE: case KVM_CAP_ASYNC_PF: case KVM_CAP_GET_TSC_KHZ: - case KVM_CAP_PCI_2_3: case KVM_CAP_KVMCLOCK_CTRL: case KVM_CAP_READONLY_MEM: +#ifdef CONFIG_KVM_DEVICE_ASSIGNMENT + case KVM_CAP_ASSIGN_DEV_IRQ: + case KVM_CAP_PCI_2_3: +#endif r = 1; break; case KVM_CAP_COALESCED_MMIO: |