mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-04 13:29:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

core-util: Fix detection when running in a VM

Browse source 
The original code that was written was trying to detect what hypervisor
we were running under, rather than testing the presence bit first. We
don't really need the former, so let's use the more comprehensive latter
instead.

Fixes: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/issues/684
This commit is contained in:
Arun Raghavan 2019-07-01 07:22:55 +05:30
parent 4c6bab4353
commit 2ed4f388de
1 changed files with 6 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/pulsecore/core-util.c
View file

@ -3518,11 +3518,7 @@ bool pa_running_in_vm(void) {
/* Both CPUID and DMI are x86 specific interfaces... */ /* Both CPUID and DMI are x86 specific interfaces... */
#ifdef HAVE_CPUID_H #ifdef HAVE_CPUID_H
uint32_t eax; unsigned int eax, ebx, ecx, edx;
union {
uint32_t sig32[3];
char text[13];
} sig;
#endif #endif
#ifdef __linux__ #ifdef __linux__
@ -3559,24 +3555,14 @@ bool pa_running_in_vm(void) {
#ifdef HAVE_CPUID_H #ifdef HAVE_CPUID_H
/* Hypervisors provide their signature on the 0x40000000 cpuid leaf. /* Hypervisors provide presence on 0x1 cpuid leaf.
* http://lwn.net/Articles/301888/ * http://lwn.net/Articles/301888/ */
* if (__get_cpuid(1, &eax, &ebx, &ecx, &edx) == 0)
* XXX: Why are we checking a list of signatures instead of the
* "hypervisor present bit"? According to the LWN article, the "hypervisor
* present bit" would be available on bit 31 of ECX on leaf 0x1, and that
* bit would tell us directly whether we're in a virtual machine or not. */
pa_zero(sig);
if (__get_cpuid(0x40000000, &eax, &sig.sig32[0], &sig.sig32[1], &sig.sig32[2]) == 0)
return false; return false;
if (pa_streq(sig.text, "XenVMMXenVMM") || if (ecx & 0x80000000)
pa_streq(sig.text, "KVMKVMKVM") ||
/* http://kb.vmware.com/selfservice/microsites/search.do?language=en_US&cmd=displayKC&externalId=1009458 */
pa_streq(sig.text, "VMwareVMware") ||
/* http://msdn.microsoft.com/en-us/library/bb969719.aspx */
pa_streq(sig.text, "Microsoft Hv"))
return true; return true;
#endif /* HAVE_CPUID_H */ #endif /* HAVE_CPUID_H */
#endif /* defined(__i386__) || defined(__x86_64__) */ #endif /* defined(__i386__) || defined(__x86_64__) */