Commit ab974657 authored by Yi Min Zhao's avatar Yi Min Zhao Committed by Cornelia Huck
Browse files

s390x/pci: refactor s390_pci_find_dev_by_idx 



s390_find_dev_by_idx() only indexes usable zpci devices. It implies
that the index value of each zpci device is dynamic and may change if
a new zpci device is plugged. So we have to use a constant index to
look up the device.

Signed-off-by: default avatarYi Min Zhao <zyimin@linux.vnet.ibm.com>
Reviewed-by: default avatarPierre Morel <pmorel@linux.vnet.ibm.com>
Signed-off-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
parent bd497683

hw/s390x/s390-pci-bus.c

+1 −20
Original line number Diff line number Diff line
@@ -223,28 +223,9 @@ static S390PCIBusDevice *s390_pci_find_dev_by_target(const char *target) 


S390PCIBusDevice *s390_pci_find_dev_by_idx(uint32_t idx)

{

    S390PCIBusDevice *pbdev;

    int i;

    int j = 0;

    S390pciState *s = s390_get_phb();



    for (i = 0; i < PCI_SLOT_MAX; i++) {

        pbdev = s->pbdev[i];

        if (!pbdev) {

            continue;

        }



        if (pbdev->state == ZPCI_FS_RESERVED) {

            continue;

        }



        if (j == idx) {

            return pbdev;

        }

        j++;

    }



    return NULL;

    return s->pbdev[idx & FH_MASK_INDEX];

}



S390PCIBusDevice *s390_pci_find_dev_by_fh(uint32_t fh)