diff options
| author | Igor Mammedov <imammedo@redhat.com> | 2017-09-21 14:59:08 +0200 |
|---|---|---|
| committer | Cornelia Huck <cohuck@redhat.com> | 2017-10-06 10:53:01 +0200 |
| commit | b6805e127c6b7815ea3abc6516b461a18d9c4d3d (patch) | |
| tree | bb85e715e5e95b9f5e3473270cdb6b55508b146e /target/s390x/cpu_models.c | |
| parent | 7705c75048cab58ca9c4e25ed5880b20598777cf (diff) | |
s390x: use generic cpu_model parsing
Define default CPU type in generic way in machine class_init
and let common machine code handle cpu_model parsing.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Message-Id: <1505998749-269631-1-git-send-email-imammedo@redhat.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Diffstat (limited to 'target/s390x/cpu_models.c')
| -rw-r--r-- | target/s390x/cpu_models.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c index 1051a16ece..48dd7beddd 100644 --- a/target/s390x/cpu_models.c +++ b/target/s390x/cpu_models.c @@ -1211,9 +1211,6 @@ static void s390_qemu_cpu_model_class_init(ObjectClass *oc, void *data) qemu_hw_version()); } -#define S390_CPU_TYPE_SUFFIX "-" TYPE_S390_CPU -#define S390_CPU_TYPE_NAME(name) (name S390_CPU_TYPE_SUFFIX) - /* Generate type name for a cpu model. Caller has to free the string. */ static char *s390_cpu_type_name(const char *model_name) { @@ -1236,14 +1233,6 @@ ObjectClass *s390_cpu_class_by_name(const char *name) return oc; } -const char *s390_default_cpu_model_name(void) -{ - if (kvm_enabled()) { - return "host"; - } - return "qemu"; -} - static const TypeInfo qemu_s390_cpu_type_info = { .name = S390_CPU_TYPE_NAME("qemu"), .parent = TYPE_S390_CPU, |