Commit 019a0b7e83 for qemu.org

commit 019a0b7e8322960d961729f3a7b72c0ef1669f62
Author: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>
Date:   Fri Oct 16 16:25:08 2026 +0000

    target/s390x: rename qmp_query_cpu_model_expansion to qmp_query_s390x_cpu_model_expansion

    Acked-by: Yonggang Luo <luoyonggang@gmail.com>
    Link: https://lore.kernel.org/qemu-devel/20261016162509.24854-6-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 4d530af1c5..ae58d0cd58 100644
--- a/include/system/qmp-cpu.h
+++ b/include/system/qmp-cpu.h
@@ -33,5 +33,9 @@ CpuModelExpansionInfo *
 qmp_query_riscv_cpu_model_expansion(CpuModelExpansionType type,
                                     CpuModelInfo *model,
                                     Error **errp);
+CpuModelExpansionInfo *
+qmp_query_s390x_cpu_model_expansion(CpuModelExpansionType type,
+                                    CpuModelInfo *model,
+                                    Error **errp);

 #endif
diff --git a/target/s390x/cpu_models_system.c b/target/s390x/cpu_models_system.c
index f82b693b0c..ccfc918b38 100644
--- a/target/s390x/cpu_models_system.c
+++ b/target/s390x/cpu_models_system.c
@@ -209,9 +209,10 @@ static void cpu_info_from_model(CpuModelInfo *info, const S390CPUModel *model,
     }
 }

-CpuModelExpansionInfo *qmp_query_cpu_model_expansion(CpuModelExpansionType type,
-                                                      CpuModelInfo *model,
-                                                      Error **errp)
+CpuModelExpansionInfo *
+qmp_query_s390x_cpu_model_expansion(CpuModelExpansionType type,
+                                    CpuModelInfo *model,
+                                    Error **errp)
 {
     Error *err = NULL;
     CpuModelExpansionInfo *expansion_info = NULL;
@@ -259,6 +260,14 @@ CpuModelExpansionInfo *qmp_query_cpu_model_expansion(CpuModelExpansionType type,
     return expansion_info;
 }

+CpuModelExpansionInfo *
+qmp_query_cpu_model_expansion(CpuModelExpansionType type,
+                              CpuModelInfo *model,
+                              Error **errp)
+{
+    return qmp_query_s390x_cpu_model_expansion(type, model, errp);
+}
+
 static void list_add_feat(const char *name, void *opaque)
 {
     strList **last = (strList **) opaque;