From nobody Tue Feb 10 21:41:21 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 153028090568980.27305601770286; Fri, 29 Jun 2018 07:01:45 -0700 (PDT) Received: from localhost ([::1]:42366 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYty1-0007XG-AR for importer@patchew.org; Fri, 29 Jun 2018 10:01:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44976) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYtt0-00032E-Ag for qemu-devel@nongnu.org; Fri, 29 Jun 2018 09:56:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fYtsz-0006lq-Bt for qemu-devel@nongnu.org; Fri, 29 Jun 2018 09:56:30 -0400 Received: from chuckie.co.uk ([82.165.15.123]:58463 helo=s16892447.onlinehome-server.info) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fYtsz-0006iG-4f for qemu-devel@nongnu.org; Fri, 29 Jun 2018 09:56:29 -0400 Received: from host109-146-217-232.range109-146.btcentralplus.com ([109.146.217.232] helo=kentang.home) by s16892447.onlinehome-server.info with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1fYttC-00058M-7R; Fri, 29 Jun 2018 14:56:43 +0100 From: Mark Cave-Ayland To: qemu-devel@nongnu.org, lersek@redhat.com, marcel@redhat.com, armbru@redhat.com, mst@redhat.com Date: Fri, 29 Jun 2018 14:56:16 +0100 Message-Id: <20180629135616.16570-3-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180629135616.16570-1-mark.cave-ayland@ilande.co.uk> References: <20180629135616.16570-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 109.146.217.232 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk X-SA-Exim-Version: 4.2.1 (built Sun, 08 Jan 2012 02:45:44 +0000) X-SA-Exim-Scanned: Yes (on s16892447.onlinehome-server.info) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 82.165.15.123 Subject: [Qemu-devel] [PATCH v2 2/2] pci: allow DeviceClass fw_name to override pci_dev_fw_name() if set X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 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" X-ZohoMail: RSF_0 Z_629925259 SPT_0 The current implementation of pci_dev_fw_name() scans through a fixed set of PCI class descriptions to determine the firmware device name but in some cases this isn't always appropriate, for example with the macio device which uses a class code of 0xff (unassigned). Rather than add a new entry for the macio device and risk a potential clash with another unassigned device later, add a check to pcibus_get_fw_dev_path() that will use DeviceClass fw_name if set in preference to pci_dev_fw_name(). This enables PCI devices such as macio to set dc->fw_name as required to match the name specified in the firmware. Signed-off-by: Mark Cave-Ayland Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/pci/pci.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 80bc45930d..126dd683dc 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -2411,12 +2411,14 @@ static char *pci_dev_fw_name(DeviceState *dev, char= *buf, int len) =20 static char *pcibus_get_fw_dev_path(DeviceState *dev) { + DeviceClass *dc =3D DEVICE_GET_CLASS(dev); PCIDevice *d =3D (PCIDevice *)dev; char path[50], name[33]; int off; =20 off =3D snprintf(path, sizeof(path), "%s@%x", - pci_dev_fw_name(dev, name, sizeof name), + dc->fw_name ? dc->fw_name : + pci_dev_fw_name(dev, name, sizeof name), PCI_SLOT(d->devfn)); if (PCI_FUNC(d->devfn)) snprintf(path + off, sizeof(path) + off, ",%x", PCI_FUNC(d->devfn)= ); --=20 2.11.0