Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-10 22:21:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

ALSA: intel8x0: move virtual environment detection code into one place

Browse Source 
This is refactoring patch: preparation for add improved detection code.
Now all detection code placed in one place.

Signed-off-by: Konstantin Ozerkov <kozerkov@parallels.com>
Signed-off-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Konstantin Ozerkov 2011-11-09 19:28:54 +04:00 committed by Takashi Iwai
parent 55c0008be6
commit 65c397d6b5
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
sound/pci/intel8x0.c
View File

@ -2937,6 +2937,24 @@ static unsigned int sis_codec_bits[3] = {
ICH_PCR, ICH_SCR, ICH_SIS_TCR
};
static int __devinit snd_intel8x0_inside_vm(void)
{
int result = inside_vm;
if (result < 0) {
/* detect KVM and Parallels virtual environments */
result = kvm_para_available();
#if defined(__i386__) || defined(__x86_64__)
result = result || boot_cpu_has(X86_FEATURE_HYPERVISOR);
#endif
}
if (result)
printk(KERN_INFO "intel8x0: enable KVM optimization\n");
return result;
}
static int __devinit snd_intel8x0_create(struct snd_card *card,
struct pci_dev *pci,
unsigned long device_type,
@ -3004,9 +3022,7 @@ static int __devinit snd_intel8x0_create(struct snd_card *card,
if (xbox)
chip->xbox = 1;
chip->inside_vm = inside_vm;
if (inside_vm)
printk(KERN_INFO "intel8x0: enable KVM optimization\n");
chip->inside_vm = snd_intel8x0_inside_vm();
if (pci->vendor == PCI_VENDOR_ID_INTEL &&
pci->device == PCI_DEVICE_ID_INTEL_440MX)
@ -3250,14 +3266,6 @@ static int __devinit snd_intel8x0_probe(struct pci_dev *pci,
buggy_irq = 0;
}
if (inside_vm < 0) {
/* detect KVM and Parallels virtual environments */
inside_vm = kvm_para_available();
#if defined(__i386__) || defined(__x86_64__)
inside_vm = inside_vm || boot_cpu_has(X86_FEATURE_HYPERVISOR);
#endif
}
if ((err = snd_intel8x0_create(card, pci, pci_id->driver_data,
&chip)) < 0) {
snd_card_free(card);