monitor/mwait workaround
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2045 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
parent
3d7374c5da
commit
0de6bb73fd
7
kqemu.c
7
kqemu.c
@ -119,7 +119,7 @@ static int is_cpuid_supported(void)
|
||||
|
||||
static void kqemu_update_cpuid(CPUState *env)
|
||||
{
|
||||
int critical_features_mask, features;
|
||||
int critical_features_mask, features, ext_features, ext_features_mask;
|
||||
uint32_t eax, ebx, ecx, edx;
|
||||
|
||||
/* the following features are kept identical on the host and
|
||||
@ -130,11 +130,14 @@ static void kqemu_update_cpuid(CPUState *env)
|
||||
CPUID_CMOV | CPUID_CX8 |
|
||||
CPUID_FXSR | CPUID_MMX | CPUID_SSE |
|
||||
CPUID_SSE2 | CPUID_SEP;
|
||||
ext_features_mask = CPUID_EXT_SSE3 | CPUID_EXT_MONITOR;
|
||||
if (!is_cpuid_supported()) {
|
||||
features = 0;
|
||||
ext_features = 0;
|
||||
} else {
|
||||
cpuid(1, eax, ebx, ecx, edx);
|
||||
features = edx;
|
||||
ext_features = ecx;
|
||||
}
|
||||
#ifdef __x86_64__
|
||||
/* NOTE: on x86_64 CPUs, SYSENTER is not supported in
|
||||
@ -144,6 +147,8 @@ static void kqemu_update_cpuid(CPUState *env)
|
||||
#endif
|
||||
env->cpuid_features = (env->cpuid_features & ~critical_features_mask) |
|
||||
(features & critical_features_mask);
|
||||
env->cpuid_ext_features = (env->cpuid_ext_features & ~ext_features_mask) |
|
||||
(ext_features & ext_features_mask);
|
||||
/* XXX: we could update more of the target CPUID state so that the
|
||||
non accelerated code sees exactly the same CPU features as the
|
||||
accelerated code */
|
||||
|
Loading…
x
Reference in New Issue
Block a user