Message ID | 1499942429-55449-2-git-send-email-borntraeger@de.ibm.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Thu, 13 Jul 2017 12:40:27 +0200 Christian Borntraeger <borntraeger@de.ibm.com> wrote: > From: Yi Min Zhao <zyimin@linux.vnet.ibm.com> > > 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> Missing blank before address. > Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com> > --- > hw/s390x/s390-virtio-ccw.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c > index e086cb5..23e9658 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)); > } Reviewed-by: Cornelia Huck <cohuck@redhat.com>
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index e086cb5..23e9658 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)); }