Commit f1db2e00e3 for qemu.org
commit f1db2e00e3dc52d1b758b6d48c8188e4e7f55aeb
Author: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>
Date: Fri Oct 16 16:25:05 2026 +0000
target/i386: rename qmp_query_cpu_model_expansion to qmp_query_i386_cpu_model_expansion
Acked-by: Yonggang Luo <luoyonggang@gmail.com>
Link: https://lore.kernel.org/qemu-devel/20261016162509.24854-3-pierrick.bouvier@oss.qualcomm.com
Signed-off-by: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>
diff --git a/include/system/qmp-cpu.h b/include/system/qmp-cpu.h
index d2e7c76ca2..cbf8ae7867 100644
--- a/include/system/qmp-cpu.h
+++ b/include/system/qmp-cpu.h
@@ -21,5 +21,9 @@ CpuModelExpansionInfo *
qmp_query_arm_cpu_model_expansion(CpuModelExpansionType type,
CpuModelInfo *model,
Error **errp);
+CpuModelExpansionInfo *
+qmp_query_i386_cpu_model_expansion(CpuModelExpansionType type,
+ CpuModelInfo *model,
+ Error **errp);
#endif
diff --git a/target/i386/cpu-system.c b/target/i386/cpu-system.c
index c8bbf0cbaf..f85dc4a703 100644
--- a/target/i386/cpu-system.c
+++ b/target/i386/cpu-system.c
@@ -27,6 +27,7 @@
#include "qapi/qobject-input-visitor.h"
#include "qom/qom-qobject.h"
#include "qapi/qapi-commands-machine.h"
+#include "system/qmp-cpu.h"
#include "cpu-internal.h"
@@ -189,9 +190,9 @@ out:
}
CpuModelExpansionInfo *
-qmp_query_cpu_model_expansion(CpuModelExpansionType type,
- CpuModelInfo *model,
- Error **errp)
+qmp_query_i386_cpu_model_expansion(CpuModelExpansionType type,
+ CpuModelInfo *model,
+ Error **errp)
{
X86CPU *xc = NULL;
Error *err = NULL;
@@ -241,6 +242,14 @@ out:
return ret;
}
+CpuModelExpansionInfo *
+qmp_query_cpu_model_expansion(CpuModelExpansionType type,
+ CpuModelInfo *model,
+ Error **errp)
+{
+ return qmp_query_i386_cpu_model_expansion(type, model, errp);
+}
+
void cpu_clear_apic_feature(CPUX86State *env)
{
env->features[FEAT_1_EDX] &= ~CPUID_APIC;