Commit d32bd032 authored by Cornelia Huck's avatar Cornelia Huck
Browse files

s390x/ccw: create s390 phb conditionally 



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

Reviewed-by: default avatarThomas Huth <thuth@redhat.com>
Acked-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: default avatarCornelia Huck <cohuck@redhat.com>
parent 21eb052c

hw/s390x/s390-virtio-ccw.c

+8 −6
Original line number Diff line number Diff line
@@ -118,12 +118,11 @@ static void ccw_init(MachineState *machine) 
{

    int ret;

    VirtualCssBus *css_bus;

    DeviceState *dev;



    s390_sclp_init();

    s390_memory_init(machine->ram_size);



    /* init CPUs */

    /* init CPUs (incl. CPU model) early so s390_has_feature() works */

    s390_init_cpus(machine);



    s390_flic_init();
@@ -134,10 +133,13 @@ static void ccw_init(MachineState *machine) 
                      machine->initrd_filename, "s390-ccw.img",

                      "s390-netboot.img", true);



    dev = qdev_create(NULL, TYPE_S390_PCI_HOST_BRIDGE);

    object_property_add_child(qdev_get_machine(), TYPE_S390_PCI_HOST_BRIDGE,

    if (s390_has_feat(S390_FEAT_ZPCI)) {

        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);

        qdev_init_nofail(dev);

    }



    /* register hypercalls */

    virtio_ccw_register_hcalls();