summaryrefslogtreecommitdiffstats
path: root/hw
diff options
context:
space:
mode:
authorFei Li2016-12-02 09:37:48 +0100
committerCornelia Huck2017-04-21 09:32:09 +0200
commitc572d3f313a3580bc2a1ec7c14a25a2ac40c32ca (patch)
tree5b421e589366f7bf402f70e5ab2bbc34c2d128df /hw
parents390x: use enum for adapter type and standardize its naming (diff)
downloadqemu-c572d3f313a3580bc2a1ec7c14a25a2ac40c32ca.tar.gz
qemu-c572d3f313a3580bc2a1ec7c14a25a2ac40c32ca.tar.xz
qemu-c572d3f313a3580bc2a1ec7c14a25a2ac40c32ca.zip
s390x: initialize flic before I/O subsystems
Let's have a flic before we move on to initialize more specific subsystems that make use of it. Signed-off-by: Fei Li <sherrylf@linux.vnet.ibm.com> Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com> Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Diffstat (limited to 'hw')
-rw-r--r--hw/s390x/s390-virtio-ccw.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 5ac315ac78..04bd0ebe40 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -113,12 +113,13 @@ static void ccw_init(MachineState *machine)
s390_sclp_init();
s390_memory_init(machine->ram_size);
+ s390_flic_init();
+
/* get a BUS */
css_bus = virtual_css_bus_init();
s390_init_ipl_dev(machine->kernel_filename, machine->kernel_cmdline,
machine->initrd_filename, "s390-ccw.img",
"s390-netboot.img", true);
- s390_flic_init();
dev = qdev_create(NULL, TYPE_S390_PCI_HOST_BRIDGE);
object_property_add_child(qdev_get_machine(), TYPE_S390_PCI_HOST_BRIDGE,