From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49755) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bGRAe-0002su-Dm for qemu-devel@nongnu.org; Fri, 24 Jun 2016 09:29:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bGRAa-0000a8-5v for qemu-devel@nongnu.org; Fri, 24 Jun 2016 09:29:19 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:52307 helo=mx0a-001b2d01.pphosted.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bGRAa-0000a4-0U for qemu-devel@nongnu.org; Fri, 24 Jun 2016 09:29:16 -0400 Received: from pps.filterd (m0098421.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.11/8.16.0.11) with SMTP id u5ODT1DE095051 for ; Fri, 24 Jun 2016 09:29:15 -0400 Received: from e06smtp05.uk.ibm.com (e06smtp05.uk.ibm.com [195.75.94.101]) by mx0a-001b2d01.pphosted.com with ESMTP id 23ryh7nuhq-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Fri, 24 Jun 2016 09:29:15 -0400 Received: from localhost by e06smtp05.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 24 Jun 2016 14:29:13 +0100 Received: from b06cxnps4075.portsmouth.uk.ibm.com (d06relay12.portsmouth.uk.ibm.com [9.149.109.197]) by d06dlp01.portsmouth.uk.ibm.com (Postfix) with ESMTP id 1C4BD17D8056 for ; Fri, 24 Jun 2016 14:30:29 +0100 (BST) Received: from d06av10.portsmouth.uk.ibm.com (d06av10.portsmouth.uk.ibm.com [9.149.37.251]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u5ODTBmi54853688 for ; Fri, 24 Jun 2016 13:29:11 GMT Received: from d06av10.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av10.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u5OCTDvB018142 for ; Fri, 24 Jun 2016 06:29:13 -0600 From: Cornelia Huck Date: Fri, 24 Jun 2016 15:28:54 +0200 In-Reply-To: <20160624132906.14446-1-cornelia.huck@de.ibm.com> References: <20160624132906.14446-1-cornelia.huck@de.ibm.com> Message-Id: <20160624132906.14446-6-cornelia.huck@de.ibm.com> Subject: [Qemu-devel] [PATCH 05/17] s390x/pci: refactor s390_pci_find_dev_by_fh List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mst@redhat.com, marcel@redhat.com, borntraeger@de.ibm.com, agraf@suse.de, jfrei@linux.vnet.ibm.com, zyimin@linux.vnet.ibm.com, Cornelia Huck From: Yi Min Zhao Because this function is called very frequently, we should use a more effective way to find the zpci device. So we use the FH's index to get the device directly. Signed-off-by: Yi Min Zhao Reviewed-by: Pierre Morel Signed-off-by: Cornelia Huck --- hw/s390x/s390-pci-bus.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c index 7111587..1b83772 100644 --- a/hw/s390x/s390-pci-bus.c +++ b/hw/s390x/s390-pci-bus.c @@ -198,19 +198,12 @@ S390PCIBusDevice *s390_pci_find_dev_by_idx(uint32_t idx) S390PCIBusDevice *s390_pci_find_dev_by_fh(uint32_t fh) { - S390PCIBusDevice *pbdev; - int i; S390pciState *s = s390_get_phb(); + S390PCIBusDevice *pbdev; - if (!fh) { - return NULL; - } - - for (i = 0; i < PCI_SLOT_MAX; i++) { - pbdev = &s->pbdev[i]; - if (pbdev->fh == fh) { - return pbdev; - } + pbdev = &s->pbdev[fh & FH_MASK_INDEX]; + if (pbdev->fh != 0 && pbdev->fh == fh) { + return pbdev; } return NULL; -- 2.9.0