From: Viktor Mihajlovski <mihaj...@linux.vnet.ibm.com> This enables qemu -cpu ? to return the list of supported CPU models on s390. Since only the host model is supported at this point in time this is pretty straight-forward. Further, a validity check for the requested CPU model was added. This change is needed to allow libvirt exploiters (like OpenStack) to specify a CPU model.
Signed-off-by: Viktor Mihajlovski <mihaj...@linux.vnet.ibm.com> Signed-off-by: Jens Freimann <jf...@linux.vnet.ibm.com> Reviewed-by: Christian Borntraeger <borntrae...@de.ibm.com> --- hw/s390-virtio.c | 5 +++++ target-s390x/cpu.c | 6 ++++++ target-s390x/cpu.h | 3 +++ 3 files changed, 14 insertions(+) diff --git a/hw/s390-virtio.c b/hw/s390-virtio.c index 685cb54..7144ac1 100644 --- a/hw/s390-virtio.c +++ b/hw/s390-virtio.c @@ -209,6 +209,11 @@ static void s390_init(QEMUMachineInitArgs *args) cpu_model = "host"; } + if (strcmp(cpu_model, "host")) { + fprintf(stderr, "S390 only supports host CPU model\n"); + exit(1); + } + ipi_states = g_malloc(sizeof(S390CPU *) * smp_cpus); for (i = 0; i < smp_cpus; i++) { diff --git a/target-s390x/cpu.c b/target-s390x/cpu.c index 619b202..03fdc31 100644 --- a/target-s390x/cpu.c +++ b/target-s390x/cpu.c @@ -25,6 +25,12 @@ #include "qemu-timer.h" +/* generate CPU information for cpu -? */ +void s390_cpu_list(FILE *f, fprintf_function cpu_fprintf) +{ + (*cpu_fprintf)(f, "s390 %16s\n", "[host]"); +} + /* CPUClass::reset() */ static void s390_cpu_reset(CPUState *s) { diff --git a/target-s390x/cpu.h b/target-s390x/cpu.h index 0f9a1f7..3513976 100644 --- a/target-s390x/cpu.h +++ b/target-s390x/cpu.h @@ -350,6 +350,9 @@ static inline void cpu_set_tls(CPUS390XState *env, target_ulong newtls) #define cpu_gen_code cpu_s390x_gen_code #define cpu_signal_handler cpu_s390x_signal_handler +void s390_cpu_list(FILE *f, fprintf_function cpu_fprintf); +#define cpu_list s390_cpu_list + #include "exec-all.h" #ifdef CONFIG_USER_ONLY -- 1.7.12.4