Skip to content

Commit 3e59fcc

Browse files
calmisiMichael Tokarev
authored andcommitted
i386/hvf: Make CPUID_HT supported
Since Commit c6bd2dd ("i386/cpu: Set up CPUID_HT in x86_cpu_expand_features() instead of cpu_x86_cpuid()"), CPUID_HT will be set in env->features[] in x86_cpu_expand_features() when vcpus >= 2. Later in x86_cpu_filter_features() it will check against the HVF supported bits. It will trigger the warning like qemu-system-x86_64: warning: host doesn't support requested feature: CPUID.01H:EDX.ht [bit 28] Add CPUID_HT to HVF supported CPUID bits to fix it. Signed-off-by: Xiaoyao Li <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Paolo Bonzini <[email protected]> (cherry picked from commit 7a48612) Signed-off-by: Michael Tokarev <[email protected]>
1 parent 2f6357c commit 3e59fcc

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

target/i386/hvf/x86_cpuid.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ uint32_t hvf_get_supported_cpuid(uint32_t func, uint32_t idx,
7373
CPUID_MSR | CPUID_PAE | CPUID_MCE | CPUID_CX8 | CPUID_APIC |
7474
CPUID_SEP | CPUID_MTRR | CPUID_PGE | CPUID_MCA | CPUID_CMOV |
7575
CPUID_PAT | CPUID_PSE36 | CPUID_CLFLUSH | CPUID_MMX |
76-
CPUID_FXSR | CPUID_SSE | CPUID_SSE2 | CPUID_SS;
76+
CPUID_FXSR | CPUID_SSE | CPUID_SSE2 | CPUID_SS | CPUID_HT;
7777
ecx &= CPUID_EXT_SSE3 | CPUID_EXT_PCLMULQDQ | CPUID_EXT_SSSE3 |
7878
CPUID_EXT_FMA | CPUID_EXT_CX16 | CPUID_EXT_PCID |
7979
CPUID_EXT_SSE41 | CPUID_EXT_SSE42 | CPUID_EXT_MOVBE |

0 commit comments

Comments
 (0)