85 lines
3.2 KiB
Diff
85 lines
3.2 KiB
Diff
From 12c5f0bbef0aed7da1b6afa1cd8303aef4f5caf1 Mon Sep 17 00:00:00 2001
|
|
From: Paolo Bonzini <pbonzini@redhat.com>
|
|
Date: Fri, 18 Jul 2025 18:03:49 +0200
|
|
Subject: [PATCH 096/115] target/i386: allow reordering max_x86_cpu_initfn vs
|
|
accel CPU init
|
|
|
|
RH-Author: Paolo Bonzini <pbonzini@redhat.com>
|
|
RH-MergeRequest: 391: TDX support, including attestation and device assignment
|
|
RH-Jira: RHEL-15710 RHEL-20798 RHEL-49728
|
|
RH-Acked-by: Yash Mankad <None>
|
|
RH-Acked-by: Peter Xu <peterx@redhat.com>
|
|
RH-Acked-by: David Hildenbrand <david@redhat.com>
|
|
RH-Commit: [96/115] 3cd04c30a233f88bf0e2747bf5d5ad2a06ffe056 (bonzini/rhel-qemu-kvm)
|
|
|
|
The PMU feature is only supported by KVM, so move it there. And since
|
|
all accelerators other than TCG overwrite the vendor, set it in
|
|
max_x86_cpu_initfn only if it has not been initialized by the
|
|
superclass. This makes it possible to run max_x86_cpu_initfn
|
|
after accelerator init.
|
|
|
|
Reviewed-by: Xiaoyao Li <xiaoyao.li@intel.com>
|
|
Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
(cherry picked from commit 810fcc41fc572d90b3c05af3f06f451626ee6b10)
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
---
|
|
target/i386/cpu.c | 24 ++++++++++++------------
|
|
target/i386/kvm/kvm-cpu.c | 2 ++
|
|
2 files changed, 14 insertions(+), 12 deletions(-)
|
|
|
|
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
|
|
index 4df98838a3..dd2180fc3a 100644
|
|
--- a/target/i386/cpu.c
|
|
+++ b/target/i386/cpu.c
|
|
@@ -5880,21 +5880,21 @@ static void max_x86_cpu_class_init(ObjectClass *oc, void *data)
|
|
static void max_x86_cpu_initfn(Object *obj)
|
|
{
|
|
X86CPU *cpu = X86_CPU(obj);
|
|
-
|
|
- /* We can't fill the features array here because we don't know yet if
|
|
- * "migratable" is true or false.
|
|
- */
|
|
- object_property_set_bool(OBJECT(cpu), "pmu", true, &error_abort);
|
|
+ CPUX86State *env = &cpu->env;
|
|
|
|
/*
|
|
- * these defaults are used for TCG and all other accelerators
|
|
- * besides KVM and HVF, which overwrite these values
|
|
+ * these defaults are used for TCG, other accelerators overwrite these
|
|
+ * values
|
|
*/
|
|
- object_property_set_str(OBJECT(cpu), "vendor", CPUID_VENDOR_AMD,
|
|
- &error_abort);
|
|
- object_property_set_str(OBJECT(cpu), "model-id",
|
|
- "QEMU TCG CPU version " QEMU_HW_VERSION,
|
|
- &error_abort);
|
|
+ if (!env->cpuid_vendor1) {
|
|
+ object_property_set_str(OBJECT(cpu), "vendor", CPUID_VENDOR_AMD,
|
|
+ &error_abort);
|
|
+ }
|
|
+ if (!env->cpuid_model[0]) {
|
|
+ object_property_set_str(OBJECT(cpu), "model-id",
|
|
+ "QEMU TCG CPU version " QEMU_HW_VERSION,
|
|
+ &error_abort);
|
|
+ }
|
|
}
|
|
|
|
static const TypeInfo max_x86_cpu_type_info = {
|
|
diff --git a/target/i386/kvm/kvm-cpu.c b/target/i386/kvm/kvm-cpu.c
|
|
index 49e820b69e..660ccb70f8 100644
|
|
--- a/target/i386/kvm/kvm-cpu.c
|
|
+++ b/target/i386/kvm/kvm-cpu.c
|
|
@@ -111,6 +111,8 @@ static void kvm_cpu_max_instance_init(X86CPU *cpu)
|
|
|
|
host_cpu_max_instance_init(cpu);
|
|
|
|
+ object_property_set_bool(OBJECT(cpu), "pmu", true, &error_abort);
|
|
+
|
|
if (lmce_supported()) {
|
|
object_property_set_bool(OBJECT(cpu), "lmce", true, &error_abort);
|
|
}
|
|
--
|
|
2.50.1
|
|
|