Series comparison

-[PATCH-for-10.1 0/6] cpus: Convert cpu_list definition to CPUClass:list_cpus callback
+[PATCH-for-10.1 v2 0/7] cpus: Convert cpu_list definition to CPUClass:list_cpus callback
+Since v1 (Thomas review comments)
+- Move s390_set_qemu_cpu_model/s390_cpu_list to "cpu_models.h"
+- Correct 'target/s390x: Register CPUClass:list_cpus' subject
 'cpu_list' might be defined per target, and force code to be
 built per-target. We can avoid that by introducing a CPUClass
 callback.
 This series combined with another which converts CPU_RESOLVING_TYPE
 to a runtime helper, allows to move most of cpu-target to common.
-Philippe Mathieu-Daudé (6):
+Based-on: <20250324165356.39540-1-philmd@linaro.org>
 Philippe Mathieu-Daudé (7):
   cpus: Introduce CPUClass::list_cpus() callback
   target/i386: Register CPUClass:list_cpus
   target/ppc: Register CPUClass:list_cpus
   target/sparc: Register CPUClass:list_cpus
-  target/sparc: Register CPUClass:list_cpus
+  target/s390x: Declare s390_set_qemu_cpu_model/cpu_list in cpu_models.h
   target/s390x: Register CPUClass:list_cpus
   cpus: Remove #ifdef check on cpu_list definition
- include/hw/core/cpu.h |  2 ++
+ include/hw/core/cpu.h      |  2 ++
- target/i386/cpu.h     |  3 ---
+ target/i386/cpu.h          |  3 ---
- target/ppc/cpu.h      |  4 ----
+ target/ppc/cpu.h           |  4 ----
- target/s390x/cpu.h    |  1 -
+ target/s390x/cpu.h         |  4 ----
- target/sparc/cpu.h    |  3 ---
+ target/s390x/cpu_models.h  |  3 +++
- cpu-target.c          | 25 ++++++++++++-------------
+ target/sparc/cpu.h         |  3 ---
- target/i386/cpu.c     |  3 ++-
+ cpu-target.c               | 25 ++++++++++++-------------
- target/ppc/cpu_init.c |  3 ++-
+ hw/s390x/s390-virtio-ccw.c |  2 +-
- target/s390x/cpu.c    |  1 +
+ target/i386/cpu.c          |  3 ++-
- target/sparc/cpu.c    |  3 ++-
+ target/ppc/cpu_init.c      |  3 ++-
-files changed, 21 insertions(+), 27 deletions(-)
+ target/s390x/cpu.c         |  1 +
  target/sparc/cpu.c         |  3 ++-
 files changed, 25 insertions(+), 31 deletions(-)
 --
 .47.1

-[PATCH-for-10.1 1/6] cpus: Introduce CPUClass::list_cpus() callback
+[PATCH-for-10.1 v2 1/7] cpus: Introduce CPUClass::list_cpus() callback
 ...
 introduce the CPUClass::list_cpus() callback.
 When no callback is registered, list_cpus() defaults
 to the cpu_list definition.
 Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
+Reviewed-by: Thomas Huth <thuth@redhat.com>
 ---
  include/hw/core/cpu.h | 2 ++
  cpu-target.c          | 8 +++++++-
 files changed, 9 insertions(+), 1 deletion(-)
 ...

-[PATCH-for-10.1 2/6] target/i386: Register CPUClass:list_cpus
+[PATCH-for-10.1 v2 2/7] target/i386: Register CPUClass:list_cpus
 Register x86_cpu_list() as CPUClass:list_cpus callback.
 Reduce its scope and remove the cpu_list definition.
 Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
+Reviewed-by: Thomas Huth <thuth@redhat.com>
 ---
  target/i386/cpu.h | 3 ---
  target/i386/cpu.c | 3 ++-
 files changed, 2 insertions(+), 4 deletions(-)
 ...

-[PATCH-for-10.1 3/6] target/ppc: Register CPUClass:list_cpus
+[PATCH-for-10.1 v2 3/7] target/ppc: Register CPUClass:list_cpus
 Register ppc_cpu_list() as CPUClass:list_cpus callback.
 Reduce its scope and remove the cpu_list definition.
 Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
+Reviewed-by: Thomas Huth <thuth@redhat.com>
 ---
  target/ppc/cpu.h      | 4 ----
  target/ppc/cpu_init.c | 3 ++-
 files changed, 2 insertions(+), 5 deletions(-)
 ...

-[PATCH-for-10.1 4/6] target/sparc: Register CPUClass:list_cpus
+[PATCH-for-10.1 v2 4/7] target/sparc: Register CPUClass:list_cpus
 Register sparc_cpu_list() as CPUClass:list_cpus callback.
 Reduce its scope and remove the cpu_list definition.
 Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
+Reviewed-by: Thomas Huth <thuth@redhat.com>
 ---
  target/sparc/cpu.h | 3 ---
  target/sparc/cpu.c | 3 ++-
 files changed, 2 insertions(+), 4 deletions(-)
 ...

-New patch
+[PATCH-for-10.1 v2 5/7] target/s390x: Declare s390_set_qemu_cpu_model/cpu_list in cpu_models.h
+Both s390_cpu_list() and s390_set_qemu_cpu_model() are
+defined in cpu_models.c, move their declarations in the
+related "cpu_models.h" header. Use full path to header
+in s390-virtio-ccw.c file.
+Suggested-by: Thomas Huth <thuth@redhat.com>
+Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
+---
+ target/s390x/cpu.h         | 4 ----
+ target/s390x/cpu_models.h  | 3 +++
+ hw/s390x/s390-virtio-ccw.c | 2 +-
+files changed, 4 insertions(+), 5 deletions(-)
+diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h
+index XXXXXXX..XXXXXXX 100644
+--- a/target/s390x/cpu.h
++++ b/target/s390x/cpu.h
+@@ -XXX,XX +XXX,XX @@ static inline uint8_t s390_cpu_get_state(S390CPU *cpu)
+ }
+-/* cpu_models.c */
+-void s390_cpu_list(void);
+ #define cpu_list s390_cpu_list
+-void s390_set_qemu_cpu_model(uint16_t type, uint8_t gen, uint8_t ec_ga,
+-                             const S390FeatInit feat_init);
+ /* helper.c */
+diff --git a/target/s390x/cpu_models.h b/target/s390x/cpu_models.h
+index XXXXXXX..XXXXXXX 100644
+--- a/target/s390x/cpu_models.h
++++ b/target/s390x/cpu_models.h
+@@ -XXX,XX +XXX,XX @@ static inline uint64_t s390_cpuid_from_cpu_model(const S390CPUModel *model)
+ }
+ S390CPUDef const *s390_find_cpu_def(uint16_t type, uint8_t gen, uint8_t ec_ga,
+                                     S390FeatBitmap features);
++void s390_set_qemu_cpu_model(uint16_t type, uint8_t gen, uint8_t ec_ga,
++                             const S390FeatInit feat_init);
++void s390_cpu_list(void);
+ bool kvm_s390_cpu_models_supported(void);
+ bool kvm_s390_get_host_cpu_model(S390CPUModel *model, Error **errp);
+diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
+index XXXXXXX..XXXXXXX 100644
+--- a/hw/s390x/s390-virtio-ccw.c
++++ b/hw/s390x/s390-virtio-ccw.c
+@@ -XXX,XX +XXX,XX @@
+ #include "hw/s390x/css-bridge.h"
+ #include "hw/s390x/ap-bridge.h"
+ #include "migration/register.h"
+-#include "cpu_models.h"
++#include "target/s390x/cpu_models.h"
+ #include "hw/nmi.h"
+ #include "hw/qdev-properties.h"
+ #include "hw/s390x/tod.h"
+--
+.47.1

-[PATCH-for-10.1 5/6] target/sparc: Register CPUClass:list_cpus
+[PATCH-for-10.1 v2 6/7] target/s390x: Register CPUClass:list_cpus
-Register sparc_cpu_list() as CPUClass:list_cpus callback
+Register s390_cpu_list() as CPUClass:list_cpus callback
 and remove the cpu_list definition.
 Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
 ---
- target/s390x/cpu.h | 1 -
  target/s390x/cpu.c | 1 +
-files changed, 1 insertion(+), 1 deletion(-)
+file changed, 1 insertion(+)
-diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h
-index XXXXXXX..XXXXXXX 100644
---- a/target/s390x/cpu.h
-+++ b/target/s390x/cpu.h
-@@ -XXX,XX +XXX,XX @@ static inline uint8_t s390_cpu_get_state(S390CPU *cpu)
- /* cpu_models.c */
- void s390_cpu_list(void);
--#define cpu_list s390_cpu_list
- void s390_set_qemu_cpu_model(uint16_t type, uint8_t gen, uint8_t ec_ga,
-                              const S390FeatInit feat_init);
 diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c
 index XXXXXXX..XXXXXXX 100644
 --- a/target/s390x/cpu.c
 +++ b/target/s390x/cpu.c
 @@ -XXX,XX +XXX,XX @@ static void s390_cpu_class_init(ObjectClass *oc, void *data)
 ...

-[PATCH-for-10.1 6/6] cpus: Remove #ifdef check on cpu_list definition
+[PATCH-for-10.1 v2 7/7] cpus: Remove #ifdef check on cpu_list definition
 Since we removed all definitions of cpu_list, the #ifdef
 check is always true. Remove it, inlining cpu_list().
 Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
+Reviewed-by: Thomas Huth <thuth@redhat.com>
 ---
  cpu-target.c | 19 ++++++-------------
 file changed, 6 insertions(+), 13 deletions(-)
 diff --git a/cpu-target.c b/cpu-target.c
 ...

Some targets define cpu_list to a method listing their
CPUs on stdout. In order to make list_cpus() generic,
introduce the CPUClass::list_cpus() callback.
When no callback is registered, list_cpus() defaults
to the cpu_list definition.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 include/hw/core/cpu.h | 2 ++
 cpu-target.c          | 8 +++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h
index XXXXXXX..XXXXXXX 100644
--- a/include/hw/core/cpu.h
+++ b/include/hw/core/cpu.h
@@ -XXX,XX +XXX,XX @@ struct SysemuCPUOps;
  * CPUClass:
  * @class_by_name: Callback to map -cpu command line model name to an
  *                 instantiatable CPU type.
+ * @list_cpus: list available CPU models and flags.
  * @parse_features: Callback to parse command line arguments.
  * @reset_dump_flags: #CPUDumpFlags to use for reset logging.
  * @mmu_index: Callback for choosing softmmu mmu index;
@@ -XXX,XX +XXX,XX @@ struct CPUClass {
     /*< public >*/
 
     ObjectClass *(*class_by_name)(const char *cpu_model);
+    void (*list_cpus)(void);
     void (*parse_features)(const char *typename, char *str, Error **errp);
 
     int (*mmu_index)(CPUState *cpu, bool ifetch);
diff --git a/cpu-target.c b/cpu-target.c
index XXXXXXX..XXXXXXX 100644
--- a/cpu-target.c
+++ b/cpu-target.c
@@ -XXX,XX +XXX,XX @@ static void cpu_list(void)
 
 void list_cpus(void)
 {
-    cpu_list();
+    CPUClass *cc = CPU_CLASS(object_class_by_name(CPU_RESOLVING_TYPE));
+
+    if (cc->list_cpus) {
+        cc->list_cpus();
+    } else {
+        cpu_list();
+    }
 }
 
 /* enable or disable single step mode. EXCP_DEBUG is returned by the
-- 
2.47.1

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 target/i386/cpu.h | 3 ---
 target/i386/cpu.c | 3 ++-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/target/i386/cpu.h b/target/i386/cpu.h
index XXXXXXX..XXXXXXX 100644
--- a/target/i386/cpu.h
+++ b/target/i386/cpu.h
@@ -XXX,XX +XXX,XX @@ int x86_cpu_gdb_read_register(CPUState *cpu, GByteArray *buf, int reg);
 int x86_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg);
 void x86_cpu_gdb_init(CPUState *cs);
 
-void x86_cpu_list(void);
 int cpu_x86_support_mca_broadcast(CPUX86State *env);
 
 #ifndef CONFIG_USER_ONLY
@@ -XXX,XX +XXX,XX @@ uint64_t cpu_get_tsc(CPUX86State *env);
 #define TARGET_DEFAULT_CPU_TYPE X86_CPU_TYPE_NAME("qemu32")
 #endif
 
-#define cpu_list x86_cpu_list
-
 /* MMU modes definitions */
 #define MMU_KSMAP64_IDX    0
 #define MMU_KSMAP32_IDX    1
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index XXXXXXX..XXXXXXX 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -XXX,XX +XXX,XX @@ static void x86_cpu_list_entry(gpointer data, gpointer user_data)
 }
 
 /* list available CPU models and flags */
-void x86_cpu_list(void)
+static void x86_cpu_list(void)
 {
     int i, j;
     GSList *list;
@@ -XXX,XX +XXX,XX @@ static void x86_cpu_common_class_init(ObjectClass *oc, void *data)
     cc->reset_dump_flags = CPU_DUMP_FPU | CPU_DUMP_CCOP;
 
     cc->class_by_name = x86_cpu_class_by_name;
+    cc->list_cpus = x86_cpu_list;
     cc->parse_features = x86_cpu_parse_featurestr;
     cc->mmu_index = x86_cpu_mmu_index;
     cc->dump_state = x86_cpu_dump_state;
-- 
2.47.1

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 target/ppc/cpu.h      | 4 ----
 target/ppc/cpu_init.c | 3 ++-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h
index XXXXXXX..XXXXXXX 100644
--- a/target/ppc/cpu.h
+++ b/target/ppc/cpu.h
@@ -XXX,XX +XXX,XX @@ void ppc_store_dawrx1(CPUPPCState *env, uint32_t value);
 #endif /* !defined(CONFIG_USER_ONLY) */
 void ppc_store_msr(CPUPPCState *env, target_ulong value);
 
-void ppc_cpu_list(void);
-
 /* Time-base and decrementer management */
 uint64_t cpu_ppc_load_tbl(CPUPPCState *env);
 uint32_t cpu_ppc_load_tbu(CPUPPCState *env);
@@ -XXX,XX +XXX,XX @@ static inline uint64_t ppc_dump_gpr(CPUPPCState *env, int gprn)
 int ppc_dcr_read(ppc_dcr_t *dcr_env, int dcrn, uint32_t *valp);
 int ppc_dcr_write(ppc_dcr_t *dcr_env, int dcrn, uint32_t val);
 
-#define cpu_list ppc_cpu_list
-
 /* MMU modes definitions */
 #define MMU_USER_IDX 0
 static inline int ppc_env_mmu_index(CPUPPCState *env, bool ifetch)
diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c
index XXXXXXX..XXXXXXX 100644
--- a/target/ppc/cpu_init.c
+++ b/target/ppc/cpu_init.c
@@ -XXX,XX +XXX,XX @@ static void ppc_cpu_list_entry(gpointer data, gpointer user_data)
     g_free(name);
 }
 
-void ppc_cpu_list(void)
+static void ppc_cpu_list(void)
 {
     GSList *list;
 
@@ -XXX,XX +XXX,XX @@ static void ppc_cpu_class_init(ObjectClass *oc, void *data)
                                        &pcc->parent_phases);
 
     cc->class_by_name = ppc_cpu_class_by_name;
+    cc->list_cpus = ppc_cpu_list;
     cc->mmu_index = ppc_cpu_mmu_index;
     cc->dump_state = ppc_cpu_dump_state;
     cc->set_pc = ppc_cpu_set_pc;
-- 
2.47.1

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 target/sparc/cpu.h | 3 ---
 target/sparc/cpu.c | 3 ++-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/target/sparc/cpu.h b/target/sparc/cpu.h
index XXXXXXX..XXXXXXX 100644
--- a/target/sparc/cpu.h
+++ b/target/sparc/cpu.h
@@ -XXX,XX +XXX,XX @@ G_NORETURN void cpu_raise_exception_ra(CPUSPARCState *, int, uintptr_t);
 
 /* cpu_init.c */
 void cpu_sparc_set_id(CPUSPARCState *env, unsigned int cpu);
-void sparc_cpu_list(void);
 /* mmu_helper.c */
 bool sparc_cpu_tlb_fill(CPUState *cs, vaddr address, int size,
                         MMUAccessType access_type, int mmu_idx,
@@ -XXX,XX +XXX,XX @@ hwaddr cpu_get_phys_page_nofault(CPUSPARCState *env, target_ulong addr,
 
 #define CPU_RESOLVING_TYPE TYPE_SPARC_CPU
 
-#define cpu_list sparc_cpu_list
-
 /* MMU modes definitions */
 #if defined (TARGET_SPARC64)
 #define MMU_USER_IDX   0
diff --git a/target/sparc/cpu.c b/target/sparc/cpu.c
index XXXXXXX..XXXXXXX 100644
--- a/target/sparc/cpu.c
+++ b/target/sparc/cpu.c
@@ -XXX,XX +XXX,XX @@ static void print_features(uint32_t features, const char *prefix)
     }
 }
 
-void sparc_cpu_list(void)
+static void sparc_cpu_list(void)
 {
     unsigned int i;
 
@@ -XXX,XX +XXX,XX @@ static void sparc_cpu_class_init(ObjectClass *oc, void *data)
                                        &scc->parent_phases);
 
     cc->class_by_name = sparc_cpu_class_by_name;
+    cc->list_cpus = sparc_cpu_list,
     cc->parse_features = sparc_cpu_parse_features;
     cc->mmu_index = sparc_cpu_mmu_index;
     cc->dump_state = sparc_cpu_dump_state;
-- 
2.47.1

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 target/s390x/cpu.h | 1 -
 target/s390x/cpu.c | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

Since we removed all definitions of cpu_list, the #ifdef
check is always true. Remove it, inlining cpu_list().

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 cpu-target.c | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/cpu-target.c b/cpu-target.c
index XXXXXXX..XXXXXXX 100644
--- a/cpu-target.c
+++ b/cpu-target.c
@@ -XXX,XX +XXX,XX @@ const char *parse_cpu_option(const char *cpu_option)
     return cpu_type;
 }
 
-#ifndef cpu_list
 static void cpu_list_entry(gpointer data, gpointer user_data)
 {
     CPUClass *cc = CPU_CLASS(OBJECT_CLASS(data));
@@ -XXX,XX +XXX,XX @@ static void cpu_list_entry(gpointer data, gpointer user_data)
     }
 }
 
-static void cpu_list(void)
-{
-    GSList *list;
-
-    list = object_class_get_list_sorted(TYPE_CPU, false);
-    qemu_printf("Available CPUs:\n");
-    g_slist_foreach(list, cpu_list_entry, NULL);
-    g_slist_free(list);
-}
-#endif
-
 void list_cpus(void)
 {
     CPUClass *cc = CPU_CLASS(object_class_by_name(CPU_RESOLVING_TYPE));
@@ -XXX,XX +XXX,XX @@ void list_cpus(void)
     if (cc->list_cpus) {
         cc->list_cpus();
     } else {
-        cpu_list();
+        GSList *list;
+
+        list = object_class_get_list_sorted(TYPE_CPU, false);
+        qemu_printf("Available CPUs:\n");
+        g_slist_foreach(list, cpu_list_entry, NULL);
+        g_slist_free(list);
     }
 }
 
-- 
2.47.1

Since v1 (Thomas review comments)
- Move s390_set_qemu_cpu_model/s390_cpu_list to "cpu_models.h"
- Correct 'target/s390x: Register CPUClass:list_cpus' subject

'cpu_list' might be defined per target, and force code to be
built per-target. We can avoid that by introducing a CPUClass
callback.

This series combined with another which converts CPU_RESOLVING_TYPE
to a runtime helper, allows to move most of cpu-target to common.

Based-on: <20250324165356.39540-1-philmd@linaro.org>

Philippe Mathieu-Daudé (7):
  cpus: Introduce CPUClass::list_cpus() callback
  target/i386: Register CPUClass:list_cpus
  target/ppc: Register CPUClass:list_cpus
  target/sparc: Register CPUClass:list_cpus
  target/s390x: Declare s390_set_qemu_cpu_model/cpu_list in cpu_models.h
  target/s390x: Register CPUClass:list_cpus
  cpus: Remove #ifdef check on cpu_list definition

-- 
2.47.1

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
 include/hw/core/cpu.h | 2 ++
 cpu-target.c          | 8 +++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
 target/i386/cpu.h | 3 ---
 target/i386/cpu.c | 3 ++-
 2 files changed, 2 insertions(+), 4 deletions(-)

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
 target/ppc/cpu.h      | 4 ----
 target/ppc/cpu_init.c | 3 ++-
 2 files changed, 2 insertions(+), 5 deletions(-)

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
 target/sparc/cpu.h | 3 ---
 target/sparc/cpu.c | 3 ++-
 2 files changed, 2 insertions(+), 4 deletions(-)

Both s390_cpu_list() and s390_set_qemu_cpu_model() are
defined in cpu_models.c, move their declarations in the
related "cpu_models.h" header. Use full path to header
in s390-virtio-ccw.c file.

Suggested-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 target/s390x/cpu.h         | 4 ----
 target/s390x/cpu_models.h  | 3 +++
 hw/s390x/s390-virtio-ccw.c | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h
index XXXXXXX..XXXXXXX 100644
--- a/target/s390x/cpu.h
+++ b/target/s390x/cpu.h
@@ -XXX,XX +XXX,XX @@ static inline uint8_t s390_cpu_get_state(S390CPU *cpu)
 }
 
 
-/* cpu_models.c */
-void s390_cpu_list(void);
 #define cpu_list s390_cpu_list
-void s390_set_qemu_cpu_model(uint16_t type, uint8_t gen, uint8_t ec_ga,
-                             const S390FeatInit feat_init);
 
 
 /* helper.c */
diff --git a/target/s390x/cpu_models.h b/target/s390x/cpu_models.h
index XXXXXXX..XXXXXXX 100644
--- a/target/s390x/cpu_models.h
+++ b/target/s390x/cpu_models.h
@@ -XXX,XX +XXX,XX @@ static inline uint64_t s390_cpuid_from_cpu_model(const S390CPUModel *model)
 }
 S390CPUDef const *s390_find_cpu_def(uint16_t type, uint8_t gen, uint8_t ec_ga,
                                     S390FeatBitmap features);
+void s390_set_qemu_cpu_model(uint16_t type, uint8_t gen, uint8_t ec_ga,
+                             const S390FeatInit feat_init);
+void s390_cpu_list(void);
 
 bool kvm_s390_cpu_models_supported(void);
 bool kvm_s390_get_host_cpu_model(S390CPUModel *model, Error **errp);
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -XXX,XX +XXX,XX @@
 #include "hw/s390x/css-bridge.h"
 #include "hw/s390x/ap-bridge.h"
 #include "migration/register.h"
-#include "cpu_models.h"
+#include "target/s390x/cpu_models.h"
 #include "hw/nmi.h"
 #include "hw/qdev-properties.h"
 #include "hw/s390x/tod.h"
-- 
2.47.1

Since we removed all definitions of cpu_list, the #ifdef
check is always true. Remove it, inlining cpu_list().

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
 cpu-target.c | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)