From nobody Mon Feb 9 20:11:31 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1671465108; cv=none; d=zohomail.com; s=zohoarc; b=geBXlOQ3OUi6ppRbwy0meD+CKDwXsSkA+IAJmEOc1sOEebVZEmAX3QXfWvo4zPF3RSO+NxtZJ6MgL96sXJhH/spe/zaF6ZV9WzDoq/2DDVHEA2oLOP1ZiqFYZYqhqY97vuHxrhs79DNtiCe1hAwIXkHV4nITromSkK6mONKJ6hE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671465108; 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=j+ieZgRXa2kZ80x0xTEVSf56xf6CIO4Nn5SBjeeTlXg=; b=HIhLxh5afh3iUBJldGF9kEGBAZ+i15ko0UuoUYXdgexPK8YdhlkbRKsJ8AqMAXswPbR13xPChCp5iRF2rGQH4qFHmPkBYNkdlXqPTYlm9p2dw1Zy4ZgsKgV1agqLUcdq1kASrouq8DDSDt9Ry4si4zhEknQpcWBpzw/6TND953U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1671465108691202.61424145864464; Mon, 19 Dec 2022 07:51:48 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p7IQS-0002gB-8M; Mon, 19 Dec 2022 10:51:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p7IQN-0002ar-3C for qemu-devel@nongnu.org; Mon, 19 Dec 2022 10:51:31 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p7IQK-0000aF-5y for qemu-devel@nongnu.org; Mon, 19 Dec 2022 10:51:29 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-662-nKbkmfMZMN6_A6nRC8jReg-1; Mon, 19 Dec 2022 10:51:23 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 32AE9101157D; Mon, 19 Dec 2022 15:51:23 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.195.91]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0538A40C1073; Mon, 19 Dec 2022 15:51:23 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 6161121E668B; Mon, 19 Dec 2022 16:51:20 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671465087; 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=j+ieZgRXa2kZ80x0xTEVSf56xf6CIO4Nn5SBjeeTlXg=; b=g+zaZ7g3K6H+PwMMkcVD/RoeB+BAmc9R+3PID0yV9/p54fz2q3vqrNCYXyLtclB9LheLV3 M4FBVCw3p9H0ChtUlPUkuKA8sxVAbC+Unsqq+x3oU8eNEYpeQ9JVaG5VlbTKMqV+0jyGEw orX2+vobvNVG1NqZxQmxecdp56VmFWs= X-MC-Unique: nKbkmfMZMN6_A6nRC8jReg-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, "Michael S . Tsirkin" Subject: [PULL 06/13] pci: Deduplicate get_class_desc() Date: Mon, 19 Dec 2022 16:51:13 +0100 Message-Id: <20221219155120.2273041-7-armbru@redhat.com> In-Reply-To: <20221219155120.2273041-1-armbru@redhat.com> References: <20221219155120.2273041-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 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=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.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_H2=-0.001, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1671465109443100003 Content-Type: text/plain; charset="utf-8" pcibus_dev_print() contains a copy of get_class_desc(). Call the function instead. Signed-off-by: Markus Armbruster Reviewed-by: Michael S. Tsirkin Message-Id: <20221201121133.3813857-7-armbru@redhat.com> --- hw/pci/pci.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 7310a82cee..41718aaf60 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -2409,15 +2409,12 @@ uint8_t pci_find_capability(PCIDevice *pdev, uint8_= t cap_id) static void pcibus_dev_print(Monitor *mon, DeviceState *dev, int indent) { PCIDevice *d =3D (PCIDevice *)dev; - const pci_class_desc *desc; + int class =3D pci_get_word(d->config + PCI_CLASS_DEVICE); + const pci_class_desc *desc =3D get_class_desc(class); char ctxt[64]; PCIIORegion *r; - int i, class; + int i; =20 - class =3D pci_get_word(d->config + PCI_CLASS_DEVICE); - desc =3D pci_class_descriptions; - while (desc->desc && class !=3D desc->class) - desc++; if (desc->desc) { snprintf(ctxt, sizeof(ctxt), "%s", desc->desc); } else { --=20 2.37.3