sim-card
/
qemu
Archived
10
0
Fork 0
Code Releases Activity

i386: derive '-cpu host' from KVM_GET_SUPPORTED_CPUID 

The fact that a host cpu supports a feature doesn't mean that QEMU and KVM
will also support it, yet -cpuid host brings host features wholesale.

We need to whitelist each feature separately to make sure we support it.
This patch adds KVM whitelisting (by simply using KVM_GET_SUPPORTED_CPUID
instead of the CPUID instruction).

Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Avi Kivity 2011-11-09 15:44:36 +02:00 committed by Anthony Liguori
parent 4f26f2b6f2
commit 66e3dd9282
1 changed files with 4 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
target-i386/cpuid.c
View File

@ -107,33 +107,14 @@ void host_cpuid(uint32_t function, uint32_t count,
uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx)
{
#if defined(CONFIG_KVM)
uint32_t vec[4];
#ifdef __x86_64__
asm volatile("cpuid"
: "=a"(vec[0]), "=b"(vec[1]),
"=c"(vec[2]), "=d"(vec[3])
: "0"(function), "c"(count) : "cc");
#else
asm volatile("pusha \n\t"
"cpuid \n\t"
"mov %%eax, 0(%2) \n\t"
"mov %%ebx, 4(%2) \n\t"
"mov %%ecx, 8(%2) \n\t"
"mov %%edx, 12(%2) \n\t"
"popa"
: : "a"(function), "c"(count), "S"(vec)
: "memory", "cc");
#endif
if (eax)
*eax = vec[0];
*eax = kvm_arch_get_supported_cpuid(kvm_state, function, count, R_EAX);
if (ebx)
*ebx = vec[1];
*ebx = kvm_arch_get_supported_cpuid(kvm_state, function, count, R_EBX);
if (ecx)
*ecx = vec[2];
*ecx = kvm_arch_get_supported_cpuid(kvm_state, function, count, R_ECX);
if (edx)
*edx = vec[3];
*edx = kvm_arch_get_supported_cpuid(kvm_state, function, count, R_EDX);
#endif
}