diff options
| author | David Hildenbrand <david@redhat.com> | 2017-08-18 13:43:41 +0200 |
|---|---|---|
| committer | Cornelia Huck <cohuck@redhat.com> | 2017-08-30 18:23:25 +0200 |
| commit | 7d00bf94dfa41d0d5759cc3ebe02b66a780c5789 (patch) | |
| tree | 6405fee961a0741f8b96776921e8975bba282d4c /hw/s390x | |
| parent | fe7cb8eab27811af76c54d29658fa83d9a9095b9 (diff) | |
| download | qemu-7d00bf94dfa41d0d5759cc3ebe02b66a780c5789.zip qemu-7d00bf94dfa41d0d5759cc3ebe02b66a780c5789.tar.gz qemu-7d00bf94dfa41d0d5759cc3ebe02b66a780c5789.tar.bz2 | |
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 'hw/s390x')
| -rw-r--r-- | hw/s390x/s390-virtio.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/hw/s390x/s390-virtio.c b/hw/s390x/s390-virtio.c index afa4148..da3f49e 100644 --- a/hw/s390x/s390-virtio.c +++ b/hw/s390x/s390-virtio.c @@ -33,7 +33,6 @@ #include "hw/boards.h" #include "hw/loader.h" #include "hw/virtio/virtio.h" -#include "sysemu/kvm.h" #include "exec/address-spaces.h" #include "sysemu/qtest.h" @@ -93,11 +92,7 @@ void s390_init_cpus(MachineState *machine) gchar *name; if (machine->cpu_model == NULL) { - if (kvm_enabled()) { - machine->cpu_model = "host"; - } else { - machine->cpu_model = "qemu"; - } + machine->cpu_model = s390_default_cpu_model_name(); } cpu_states = g_new0(S390CPU *, max_cpus); |