58 lines
2.0 KiB
Diff
58 lines
2.0 KiB
Diff
|
From e0b51ea0f229ea9c6788fa0da252e8100e30241e Mon Sep 17 00:00:00 2001
|
||
|
|
From: Xiaoyao Li <xiaoyao.li@intel.com>
|
||
|
|
Date: Wed, 14 Aug 2024 03:54:23 -0400
|
||
|
|
Subject: [PATCH] target/i386: Don't construct a all-zero entry for CPUID[0xD
|
||
|
|
0x3f]
|
||
|
|
|
||
|
|
commit 00c8a933d95add3ce4afebbe491ca0fa398a9007 upstream.
|
||
|
|
|
||
|
|
Currently, QEMU always constructs a all-zero CPUID entry for
|
||
|
|
CPUID[0xD 0x3f].
|
||
|
|
|
||
|
|
It's meaningless to construct such a leaf as the end of leaf 0xD. Rework
|
||
|
|
the logic of how subleaves of 0xD are constructed to get rid of such
|
||
|
|
all-zero value of subleaf 0x3f.
|
||
|
|
|
||
|
|
Intel-SIG: commit 00c8a933d95a target/i386: Don't construct a all-zero entry for CPUID[0xD 0x3f]
|
||
|
|
|
||
|
|
Signed-off-by: Xiaoyao Li <xiaoyao.li@intel.com>
|
||
|
|
Link: https://lore.kernel.org/r/20240814075431.339209-2-xiaoyao.li@intel.com
|
||
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||
|
|
Signed-off-by: Jason Zeng <jason.zeng@intel.com>
|
||
|
|
---
|
||
|
|
target/i386/kvm/kvm.c | 11 ++++++-----
|
||
|
|
1 file changed, 6 insertions(+), 5 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c
|
||
|
|
index 850104f6b5..5057dfbd75 100644
|
||
|
|
--- a/target/i386/kvm/kvm.c
|
||
|
|
+++ b/target/i386/kvm/kvm.c
|
||
|
|
@@ -1924,10 +1924,6 @@ int kvm_arch_init_vcpu(CPUState *cs)
|
||
|
|
case 0xb:
|
||
|
|
case 0xd:
|
||
|
|
for (j = 0; ; j++) {
|
||
|
|
- if (i == 0xd && j == 64) {
|
||
|
|
- break;
|
||
|
|
- }
|
||
|
|
-
|
||
|
|
c->function = i;
|
||
|
|
c->flags = KVM_CPUID_FLAG_SIGNIFCANT_INDEX;
|
||
|
|
c->index = j;
|
||
|
|
@@ -1943,7 +1939,12 @@ int kvm_arch_init_vcpu(CPUState *cs)
|
||
|
|
break;
|
||
|
|
}
|
||
|
|
if (i == 0xd && c->eax == 0) {
|
||
|
|
- continue;
|
||
|
|
+ if (j < 63) {
|
||
|
|
+ continue;
|
||
|
|
+ } else {
|
||
|
|
+ cpuid_i--;
|
||
|
|
+ break;
|
||
|
|
+ }
|
||
|
|
}
|
||
|
|
if (cpuid_i == KVM_MAX_CPUID_ENTRIES) {
|
||
|
|
fprintf(stderr, "cpuid_data is full, no space for "
|
||
|
|
--
|
||
|
|
2.41.0.windows.1
|
||
|
|
|