Merge branch 'for-linus' of git://git.kernel.dk/linux-block

[karo-tx-linux.git] / sound / pci / intel8x0.c

diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c
index 8151318a69a2fb65fa53f44f07233792338a2011..9720a30dbfff31fb412b385370647927e6ecef3a 100644 (file)
--- a/sound/pci/intel8x0.c
+++ b/sound/pci/intel8x0.c
@@ -42,12 +42,6 @@
 #include <asm/pgtable.h>
 #include <asm/cacheflush.h>
 
-#ifdef CONFIG_KVM_GUEST
-#include <linux/kvm_para.h>
-#else
-#define kvm_para_available() (0)
-#endif
-
 MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
 MODULE_DESCRIPTION("Intel 82801AA,82901AB,i810,i820,i830,i840,i845,MX440; SiS 7012; Ali 5455");
 MODULE_LICENSE("GPL");
@@ -2972,25 +2966,17 @@ static int snd_intel8x0_inside_vm(struct pci_dev *pci)
                goto fini;
        }
 
-       /* detect KVM and Parallels virtual environments */
-       result = kvm_para_available();
-#ifdef X86_FEATURE_HYPERVISOR
-       result = result || boot_cpu_has(X86_FEATURE_HYPERVISOR);
-#endif
-       if (!result)
-               goto fini;
-
        /* check for known (emulated) devices */
+       result = 0;
        if (pci->subsystem_vendor == PCI_SUBVENDOR_ID_REDHAT_QUMRANET &&
            pci->subsystem_device == PCI_SUBDEVICE_ID_QEMU) {
                /* KVM emulated sound, PCI SSID: 1af4:1100 */
                msg = "enable KVM";
+               result = 1;
        } else if (pci->subsystem_vendor == 0x1ab8) {
                /* Parallels VM emulated sound, PCI SSID: 1ab8:xxxx */
                msg = "enable Parallels VM";
-       } else {
-               msg = "disable (unknown or VT-d) VM";
-               result = 0;
+               result = 1;
        }
 
 fini: