Commit 930072d2 authored by Jason J. Herne's avatar Jason J. Herne Committed by Thomas Huth
Browse files

s390-bios: Extend find_dev() for non-virtio devices 



We need a method for finding the subchannel of a dasd device. Let's
modify find_dev to handle this since it mostly does what we need. Up to
this point find_dev has been specific to only virtio devices.

Signed-off-by: default avatarJason J. Herne <jjherne@linux.ibm.com>
Acked-by: default avatarHalil Pasic <pasic@linux.vnet.ibm.com>
Reviewed-by: default avatarCornelia Huck <cohuck@redhat.com>
Message-Id: <1554388475-18329-11-git-send-email-jjherne@linux.ibm.com>
Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
parent 86c58705

pc-bios/s390-ccw/main.c

+11 −5
Original line number Diff line number Diff line
@@ -52,6 +52,12 @@ unsigned int get_loadparm_index(void) 
    return atoui(loadparm_str);

}



/*

 * Find the subchannel connected to the given device (dev_no) and fill in the

 * subchannel information block (schib) with the connected subchannel's info.

 * NOTE: The global variable blk_schid is updated to contain the subchannel

 * information.

 */

static bool find_dev(Schib *schib, int dev_no)

{

    int i, r;
@@ -65,15 +71,15 @@ static bool find_dev(Schib *schib, int dev_no) 
        if (!schib->pmcw.dnv) {

            continue;

        }

        if (!virtio_is_supported(blk_schid)) {

            continue;

        }



        /* Skip net devices since no IPLB is created and therefore no

         * no network bootloader has been loaded

         * network bootloader has been loaded

         */

        if (virtio_get_device_type() == VIRTIO_ID_NET && dev_no < 0) {

        if (virtio_is_supported(blk_schid) &&

            virtio_get_device_type() == VIRTIO_ID_NET && dev_no < 0) {

            continue;

        }



        if ((dev_no < 0) || (schib->pmcw.dev == dev_no)) {

            return true;

        }