diff options
| author | David Hildenbrand | 2017-08-18 13:43:41 +0200 |
|---|---|---|
| committer | Cornelia Huck | 2017-08-30 18:23:25 +0200 |
| commit | 7d00bf94dfa41d0d5759cc3ebe02b66a780c5789 (patch) | |
| tree | 6405fee961a0741f8b96776921e8975bba282d4c /target | |
| parent | target/s390x: no need to pass kvm_state to savevm_gtod handlers (diff) | |
| download | qemu-7d00bf94dfa41d0d5759cc3ebe02b66a780c5789.tar.gz qemu-7d00bf94dfa41d0d5759cc3ebe02b66a780c5789.tar.xz qemu-7d00bf94dfa41d0d5759cc3ebe02b66a780c5789.zip | |
s390x/cpumodel: factor out determination of default model name
Now we can drop inclusion of "sysemu/kvm.h" from "s390-virtio.c".
Signed-off-by: David Hildenbrand <david@redhat.com>
Message-Id: <20170818114353.13455-7-david@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Diffstat (limited to 'target')
| -rw-r--r-- | target/s390x/cpu.h | 1 | ||||
| -rw-r--r-- | target/s390x/cpu_models.c | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h index 798e299db1..3ce7ffc126 100644 --- a/target/s390x/cpu.h +++ b/target/s390x/cpu.h @@ -647,6 +647,7 @@ void s390_cpu_model_register_props(Object *obj); void s390_cpu_model_class_register_props(ObjectClass *oc); void s390_realize_cpu_model(CPUState *cs, Error **errp); ObjectClass *s390_cpu_class_by_name(const char *name); +const char *s390_default_cpu_model_name(void); #define EXCP_EXT 1 /* external interrupt */ #define EXCP_SVC 2 /* supervisor call (syscall) */ diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c index fa1338fc72..915f067991 100644 --- a/target/s390x/cpu_models.c +++ b/target/s390x/cpu_models.c @@ -1200,6 +1200,14 @@ 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, |