From nobody Tue Feb 10 20:50:03 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1604265262; cv=none; d=zohomail.com; s=zohoarc; b=FzUXwG/UisNcKztBCGUa1jjW8oX2U6K6UQ1qjyTyJdqrpPrTe1doTOK1di0mIrvnhOBAjrIZL3Xrv9LqWaqPgYyzjRzGjtmqMazYGG93/rftfCB9nBz1aKuOmP1nrTOlPubhaKcG729Ko5LCv2M8P5qbNxeTU6l0QEFEFhD+SVI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604265262; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=nr/fzc1bZjrHxpFXT5zgiEqsh2/Xp2SWSvJQFqA5qjI=; b=O1QI+5gy3BvdJtYP07agH3fY0CKv3oxHeuYk3ukeBCIix8GCqusFf38ALmyAaEGMNjjCb4M51fYidSyz1GO5Cx1nhYqGAh3SLWYbbJJcJpPW8+IimDp7tX6e0TSQA9bKqnSmdL0QWtc0CFTutCYcauNwbYsTc9X/TG6d3MpDATk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1604265262041725.9300996747543; Sun, 1 Nov 2020 13:14:22 -0800 (PST) Received: from localhost ([::1]:33044 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kZKg8-00071p-UN for importer@patchew.org; Sun, 01 Nov 2020 16:14:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60612) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kZKUP-0007QK-I1 for qemu-devel@nongnu.org; Sun, 01 Nov 2020 16:02:15 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:25537) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kZKUN-0005X3-6y for qemu-devel@nongnu.org; Sun, 01 Nov 2020 16:02:13 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-40-6_JgZN-iNIap8r51S5djgw-1; Sun, 01 Nov 2020 16:02:08 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1B249185A0C1; Sun, 1 Nov 2020 21:02:07 +0000 (UTC) Received: from gimli.home (ovpn-112-213.phx2.redhat.com [10.3.112.213]) by smtp.corp.redhat.com (Postfix) with ESMTP id BD52555776; Sun, 1 Nov 2020 21:02:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604264529; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nr/fzc1bZjrHxpFXT5zgiEqsh2/Xp2SWSvJQFqA5qjI=; b=EQ/nUWxRL2wSW4UxdoyjTemMggrUKqy9GvtGNGgogFHLxREdA3VapHxIjy49HY9vSA0kbQ LMjyb1NJ2pRmGm9FOf2WYLDublT1aMJJvDOTxrVdaNjxuCrl4q7OWoUca14nwqBQtymIIK o1j1j/qt4Os30YrI/YmNUXJdX5leczs= X-MC-Unique: 6_JgZN-iNIap8r51S5djgw-1 Subject: [PULL v3 21/32] vfio: Create shared routine for scanning info capabilities From: Alex Williamson To: qemu-devel@nongnu.org Date: Sun, 01 Nov 2020 14:02:06 -0700 Message-ID: <160426452639.24886.8655293130239535707.stgit@gimli.home> In-Reply-To: <160426371498.24886.12193840637250368669.stgit@gimli.home> References: <160426371498.24886.12193840637250368669.stgit@gimli.home> User-Agent: StGit/0.21-dirty MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=alex.williamson@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=63.128.21.124; envelope-from=alex.williamson@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/01 15:59:21 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=-1, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Cornelia Huck , Philippe =?utf-8?q?Mathieu-Daud=C3=A9?= , Matthew Rosato Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Matthew Rosato Rather than duplicating the same loop in multiple locations, create a static function to do the work. Signed-off-by: Matthew Rosato Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Cornelia Huck Signed-off-by: Alex Williamson --- hw/vfio/common.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/hw/vfio/common.c b/hw/vfio/common.c index d41ba67ffbbb..693d3a29439a 100644 --- a/hw/vfio/common.c +++ b/hw/vfio/common.c @@ -1125,17 +1125,12 @@ static void vfio_listener_release(VFIOContainer *co= ntainer) } } =20 -struct vfio_info_cap_header * -vfio_get_region_info_cap(struct vfio_region_info *info, uint16_t id) +static struct vfio_info_cap_header * +vfio_get_cap(void *ptr, uint32_t cap_offset, uint16_t id) { struct vfio_info_cap_header *hdr; - void *ptr =3D info; =20 - if (!(info->flags & VFIO_REGION_INFO_FLAG_CAPS)) { - return NULL; - } - - for (hdr =3D ptr + info->cap_offset; hdr !=3D ptr; hdr =3D ptr + hdr->= next) { + for (hdr =3D ptr + cap_offset; hdr !=3D ptr; hdr =3D ptr + hdr->next) { if (hdr->id =3D=3D id) { return hdr; } @@ -1144,6 +1139,16 @@ vfio_get_region_info_cap(struct vfio_region_info *in= fo, uint16_t id) return NULL; } =20 +struct vfio_info_cap_header * +vfio_get_region_info_cap(struct vfio_region_info *info, uint16_t id) +{ + if (!(info->flags & VFIO_REGION_INFO_FLAG_CAPS)) { + return NULL; + } + + return vfio_get_cap((void *)info, info->cap_offset, id); +} + static int vfio_setup_region_sparse_mmaps(VFIORegion *region, struct vfio_region_info *info) {