ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Yi Min Zhao <zyimin@linux.vnet.ibm.com>
Reviewed-by: Pierre Morel <pmorel@linux.vnet.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
This commit is contained in:
Yi Min Zhao 2016-06-03 14:17:59 +08:00 committed by Cornelia Huck
parent bd4976838d
commit ab9746570a
1 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
hw/s390x/s390-pci-bus.c
View File

@ -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 *s390_pci_find_dev_by_idx(uint32_t idx)
{ {
S390PCIBusDevice *pbdev;
int i;
int j = 0;
S390pciState *s = s390_get_phb(); S390pciState *s = s390_get_phb();
for (i = 0; i < PCI_SLOT_MAX; i++) { return s->pbdev[idx & FH_MASK_INDEX];
pbdev = s->pbdev[i];
if (!pbdev) {
continue;
}
if (pbdev->state == ZPCI_FS_RESERVED) {
continue;
}
if (j == idx) {
return pbdev;
}
j++;
}
return NULL;
} }
S390PCIBusDevice *s390_pci_find_dev_by_fh(uint32_t fh) S390PCIBusDevice *s390_pci_find_dev_by_fh(uint32_t fh)