[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 21/25] s390x/pci: refactor s390_pci_find_dev_by_idx
From: |
Cornelia Huck |
Subject: |
[Qemu-devel] [PULL 21/25] s390x/pci: refactor s390_pci_find_dev_by_idx |
Date: |
Mon, 11 Jul 2016 10:09:08 +0200 |
From: Yi Min Zhao <address@hidden>
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 <address@hidden>
Reviewed-by: Pierre Morel <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
---
hw/s390x/s390-pci-bus.c | 21 +--------------------
1 file changed, 1 insertion(+), 20 deletions(-)
diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c
index 57d5d14..9e24268 100644
--- a/hw/s390x/s390-pci-bus.c
+++ b/hw/s390x/s390-pci-bus.c
@@ -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)
--
2.9.0
- [Qemu-devel] [PULL 19/25] s390x/pci: enable zpci hot-plug/hot-unplug, (continued)
- [Qemu-devel] [PULL 19/25] s390x/pci: enable zpci hot-plug/hot-unplug, Cornelia Huck, 2016/07/11
- [Qemu-devel] [PULL 17/25] s390x/pci: introduce S390PCIBusDevice qdev, Cornelia Huck, 2016/07/11
- [Qemu-devel] [PULL 03/25] s390x/ipl: Support IPL from selected SCSI device, Cornelia Huck, 2016/07/11
- [Qemu-devel] [PULL 02/25] pc-bios/s390-ccw.img: rebuild image, Cornelia Huck, 2016/07/11
- [Qemu-devel] [PULL 15/25] s390x/pci: introduce S390PCIBus, Cornelia Huck, 2016/07/11
- [Qemu-devel] [PULL 23/25] s390x/pci: fix stpcifc_service_call, Cornelia Huck, 2016/07/11
- [Qemu-devel] [PULL 20/25] s390x/pci: add checkings in CLP_SET_PCI_FN, Cornelia Huck, 2016/07/11
- [Qemu-devel] [PULL 18/25] s390x/pci: enable uid-checking, Cornelia Huck, 2016/07/11
- [Qemu-devel] [PULL 11/25] s390x/pci: write fid in CLP_QUERY_PCI_FN, Cornelia Huck, 2016/07/11
- [Qemu-devel] [PULL 16/25] s390x/pci: introduce S390PCIIOMMU, Cornelia Huck, 2016/07/11
- [Qemu-devel] [PULL 21/25] s390x/pci: refactor s390_pci_find_dev_by_idx,
Cornelia Huck <=
- [Qemu-devel] [PULL 10/25] s390x/pci: acceleration for getting S390pciState, Cornelia Huck, 2016/07/11
- [Qemu-devel] [PULL 24/25] s390x/pci: replace fid with idx in msg data of msix, Cornelia Huck, 2016/07/11
- [Qemu-devel] [PULL 07/25] s390x/css: Factor out virtual css bridge and bus, Cornelia Huck, 2016/07/11
- [Qemu-devel] [PULL 22/25] s390x/pci: refactor list_pci, Cornelia Huck, 2016/07/11
- [Qemu-devel] [PULL 25/25] s390x/pci: make hot-unplug handler smoother, Cornelia Huck, 2016/07/11
- [Qemu-devel] [PULL 13/25] s390x/pci: refactor s390_pci_find_dev_by_fh, Cornelia Huck, 2016/07/11
- Re: [Qemu-devel] [PULL 00/25] s390x patches for 2.7, Peter Maydell, 2016/07/12