openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

s390x/ccw: create s390 phb conditionally 

Don't create the s390 pci host bridge if we do not provide the zpci
facility.

Reviewed-by: Thomas Huth <thuth@redhat.com>
Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
This commit is contained in:
Cornelia Huck 2017-07-06 17:21:52 +02:00
parent 21eb052cf2
commit d32bd032d8
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/s390x/s390-virtio-ccw.c
View File

@ -118,12 +118,11 @@ static void ccw_init(MachineState *machine)
{ {
int ret; int ret;
VirtualCssBus *css_bus; VirtualCssBus *css_bus;
DeviceState *dev;
s390_sclp_init(); s390_sclp_init();
s390_memory_init(machine->ram_size); s390_memory_init(machine->ram_size);
/* init CPUs */ /* init CPUs (incl. CPU model) early so s390_has_feature() works */
s390_init_cpus(machine); s390_init_cpus(machine);
s390_flic_init(); s390_flic_init();
@ -134,10 +133,13 @@ static void ccw_init(MachineState *machine)
machine->initrd_filename, "s390-ccw.img", machine->initrd_filename, "s390-ccw.img",
"s390-netboot.img", true); "s390-netboot.img", true);
dev = qdev_create(NULL, TYPE_S390_PCI_HOST_BRIDGE); if (s390_has_feat(S390_FEAT_ZPCI)) {
object_property_add_child(qdev_get_machine(), TYPE_S390_PCI_HOST_BRIDGE, DeviceState *dev = qdev_create(NULL, TYPE_S390_PCI_HOST_BRIDGE);
object_property_add_child(qdev_get_machine(),
TYPE_S390_PCI_HOST_BRIDGE,
OBJECT(dev), NULL); OBJECT(dev), NULL);
qdev_init_nofail(dev); qdev_init_nofail(dev);
}
/* register hypercalls */ /* register hypercalls */
virtio_ccw_register_hcalls(); virtio_ccw_register_hcalls();