diff options
| author | Yi Min Zhao | 2017-06-14 07:16:20 +0200 |
|---|---|---|
| committer | Christian Borntraeger | 2017-07-14 12:29:49 +0200 |
| commit | 3720d3356d47aedf2f66b6586011661a7eeb0222 (patch) | |
| tree | 4392d63a0e21ce88df15410deab33434365b77e6 /hw | |
| parent | pc-bios/s390: rebuild s390-ccw.img (diff) | |
| download | qemu-3720d3356d47aedf2f66b6586011661a7eeb0222.tar.gz qemu-3720d3356d47aedf2f66b6586011661a7eeb0222.tar.xz qemu-3720d3356d47aedf2f66b6586011661a7eeb0222.zip | |
s390x: initialize cpu firstly
By initializing the CPU firstly, we are able to retrieve and use the
CPU model features when initializing other subsystem or devices.
Signed-off-by: Yi Min Zhao <zyimin@linux.vnet.ibm.com>
Reviewed-by: Pierre Morel <pmorel@linux.vnet.ibm.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/s390x/s390-virtio-ccw.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index e086cb517e..23e9658382 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -122,6 +122,9 @@ static void ccw_init(MachineState *machine) s390_sclp_init(); s390_memory_init(machine->ram_size); + /* init CPUs */ + s390_init_cpus(machine); + s390_flic_init(); /* get a BUS */ @@ -138,9 +141,6 @@ static void ccw_init(MachineState *machine) /* register hypercalls */ virtio_ccw_register_hcalls(); - /* init CPUs */ - s390_init_cpus(machine); - if (kvm_enabled()) { kvm_s390_enable_css_support(s390_cpu_addr2state(0)); } |