42 lines
1.3 KiB
Diff
42 lines
1.3 KiB
Diff
|
From 3b70aff18c50fc36dde1a0d305acfd1872f57141 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Xiaoyao Li <xiaoyao.li@intel.com>
|
||
|
|
Date: Wed, 24 Jan 2024 21:40:14 -0500
|
||
|
|
Subject: [PATCH] i386/cpuid: Decrease cpuid_i when skipping CPUID leaf 1F
|
||
|
|
|
||
|
|
commit 10f92799af8ba3c3cef2352adcd4780f13fbab31 upstream.
|
||
|
|
|
||
|
|
Existing code misses a decrement of cpuid_i when skip leaf 0x1F.
|
||
|
|
There's a blank CPUID entry(with leaf, subleaf as 0, and all fields
|
||
|
|
stuffed 0s) left in the CPUID array.
|
||
|
|
|
||
|
|
It conflicts with correct CPUID leaf 0.
|
||
|
|
|
||
|
|
Intel-SIG: commit 10f92799af8b i386/cpuid: Decrease cpuid_i when skipping CPUID leaf 1F
|
||
|
|
Backport i386/cpu bugfixes
|
||
|
|
|
||
|
|
Signed-off-by: Xiaoyao Li <xiaoyao.li@intel.com>
|
||
|
|
Reviewed-by:Yang Weijiang <weijiang.yang@intel.com>
|
||
|
|
Message-ID: <20240125024016.2521244-2-xiaoyao.li@intel.com>
|
||
|
|
Cc: qemu-stable@nongnu.org
|
||
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||
|
|
Signed-off-by: Jason Zeng <jason.zeng@intel.com>
|
||
|
|
---
|
||
|
|
target/i386/kvm/kvm.c | 1 +
|
||
|
|
1 file changed, 1 insertion(+)
|
||
|
|
|
||
|
|
diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c
|
||
|
|
index e1601422bc..0927d1f515 100644
|
||
|
|
--- a/target/i386/kvm/kvm.c
|
||
|
|
+++ b/target/i386/kvm/kvm.c
|
||
|
|
@@ -1759,6 +1759,7 @@ int kvm_arch_init_vcpu(CPUState *cs)
|
||
|
|
}
|
||
|
|
case 0x1f:
|
||
|
|
if (env->nr_dies < 2) {
|
||
|
|
+ cpuid_i--;
|
||
|
|
break;
|
||
|
|
}
|
||
|
|
/* fallthrough */
|
||
|
|
--
|
||
|
|
2.27.0
|
||
|
|
|