diff options
| author | David Hildenbrand <david@redhat.com> | 2017-12-08 17:55:29 +0100 |
|---|---|---|
| committer | Cornelia Huck <cohuck@redhat.com> | 2017-12-14 17:56:54 +0100 |
| commit | 35b4df6417fc3cd9d0150590f770fdd404dfbee7 (patch) | |
| tree | 9727210ae6823b94049faa4e30598f2ffc8d01ec /hw/s390x/s390-virtio-ccw.c | |
| parent | 33ae8a424245bb9ebb66875ca5b16c26f9e88da6 (diff) | |
| download | qemu-35b4df6417fc3cd9d0150590f770fdd404dfbee7.zip | |
s390x: change the QEMU cpu model to a stripped down z12
We are good enough to boot upstream Linux kernels / Fedora 26/27. That
should be sufficient for now.
As the QEMU CPU model is migration safe, let's add compatibility code.
Generate the feature list to reduce the chance of messing things up in the
future.
Signed-off-by: David Hildenbrand <david@redhat.com>
Message-Id: <20171208165529.14124-1-david@redhat.com>
[CH: squashed 's390x/cpumodel: make qemu cpu model play with "none" machine'
(20171213132407.5227-1-david@redhat.com) and 's390x/tcg: don't include z13
features in the qemu model' (20171213171512.17601-1-david@redhat.com) into
patch]
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Diffstat (limited to 'hw/s390x/s390-virtio-ccw.c')
| -rw-r--r-- | hw/s390x/s390-virtio-ccw.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index fe3f3b2ad6..466e45343c 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -734,7 +734,11 @@ DEFINE_CCW_MACHINE(2_12, "2.12", true); static void ccw_machine_2_11_instance_options(MachineState *machine) { + static const S390FeatInit qemu_cpu_feat = { S390_FEAT_LIST_QEMU_V2_11 }; ccw_machine_2_12_instance_options(machine); + + /* before 2.12 we emulated the very first z900 */ + s390_set_qemu_cpu_model(0x2064, 7, 1, qemu_cpu_feat); } static void ccw_machine_2_11_class_options(MachineClass *mc) |