From nobody Tue May 7 14:32:24 2024 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=1669896822; cv=none; d=zohomail.com; s=zohoarc; b=VRHAqS4e6LQt5uW/5eA3e1jpxQfeiHyMlmSKsASIkhvUDnsfkCvXqDidBNWHc1gG9XzjVWk5l8/vN9PKTU431F7Tyk0CSi5NC+l/p6lJi99JvVIiPaIemJePJkwq3Ud6aoOAdaUZcainidtiqfzzv/GZKpp5eCHFTdmAzLwSwTM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1669896822; 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=pURPJ8TNbB3lFBdmzy5ka69deY03W+cS5xx4sJp8TDE=; b=oBL4/R0PTWL4aioFAfG0QNYrcTUSTLl5Er2wEfC94/YvLoTcZfjIFAHH3EhLeVYvfRK+tafmJg1xVQfjNazl3BSAtDmpUkEXmxvWlQoWwBiH/YBrrGJR2Z6MTGnyZSSJH2VodTAtrz1AH0h3wcs07V6+KFdCv0eX5YjkWuh4Lhw= 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 1669896822915717.2046629918772; Thu, 1 Dec 2022 04:13:42 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p0iQB-0004WH-7d; Thu, 01 Dec 2022 07:12:07 -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 1p0iPs-0004Fr-St for qemu-devel@nongnu.org; Thu, 01 Dec 2022 07:11:48 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p0iPl-0008D7-Kw for qemu-devel@nongnu.org; Thu, 01 Dec 2022 07:11:47 -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-113-H5zj7IcQPkWBOTZjQcL_hw-1; Thu, 01 Dec 2022 07:11:37 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5E96485A588; Thu, 1 Dec 2022 12:11:37 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3180C4A9254; Thu, 1 Dec 2022 12:11:37 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id DCE0121E6930; Thu, 1 Dec 2022 13:11:33 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669896700; 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=pURPJ8TNbB3lFBdmzy5ka69deY03W+cS5xx4sJp8TDE=; b=NAWVWhsCuHhoQVPA4+Sc8X6CbmT2yhrSb9Otb/S1+3BXPGIu0WHhgVkw4ZRJg5qx086E6e 4cm/Bp2wY5Z/5sbenljzsV6m2MUU17zHc9plDXtwV3iGrg5Tj1IPHLM+7BCenU1bdimkjd fsEhCWPX/ju8xWVcfnRw8fGHhP4M8+Y= X-MC-Unique: H5zj7IcQPkWBOTZjQcL_hw-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: mst@redhat.com, marcel.apfelbaum@gmail.com, dgilbert@redhat.com, philmd@linaro.org Subject: [PATCH v2 01/13] pci: Clean up a few things checkpatch.pl would flag later on Date: Thu, 1 Dec 2022 13:11:21 +0100 Message-Id: <20221201121133.3813857-2-armbru@redhat.com> In-Reply-To: <20221201121133.3813857-1-armbru@redhat.com> References: <20221201121133.3813857-1-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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.129.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.4 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: 1669896824779100003 Fix a few style violations so that checkpatch.pl won't complain when I move this code. Signed-off-by: Markus Armbruster Reviewed-by: Michael S. Tsirkin Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/pci/pci.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 2f450f6a72..53ed447115 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -1851,10 +1851,12 @@ static PciBridgeInfo *qmp_query_pci_bridge(PCIDevic= e *dev, PCIBus *bus, range->limit =3D pci_bridge_get_limit(dev, PCI_BASE_ADDRESS_MEM_PREFET= CH); =20 if (dev->config[PCI_SECONDARY_BUS] !=3D 0) { - PCIBus *child_bus =3D pci_find_bus_nr(bus, dev->config[PCI_SECONDA= RY_BUS]); + PCIBus *child_bus =3D pci_find_bus_nr(bus, + dev->config[PCI_SECONDARY_BUS]= ); if (child_bus) { info->has_devices =3D true; - info->devices =3D qmp_query_pci_devices(child_bus, dev->config= [PCI_SECONDARY_BUS]); + info->devices =3D qmp_query_pci_devices(child_bus, + dev->config[PCI_SECONDARY_BUS]= ); } } =20 @@ -2612,8 +2614,9 @@ static void pcibus_dev_print(Monitor *mon, DeviceStat= e *dev, int indent) pci_get_word(d->config + PCI_SUBSYSTEM_ID)); for (i =3D 0; i < PCI_NUM_REGIONS; i++) { r =3D &d->io_regions[i]; - if (!r->size) + if (!r->size) { continue; + } monitor_printf(mon, "%*sbar %d: %s at 0x%"FMT_PCIBUS " [0x%"FMT_PCIBUS"]\n", indent, "", --=20 2.37.3 From nobody Tue May 7 14:32:24 2024 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=1669896902; cv=none; d=zohomail.com; s=zohoarc; b=SZdGh11gebFSe+SIkAbb63tPsdxFg8tZFdw2YyEcXtoiyfM9P07HnB0jDdHqgiSWDQauY390jVjX2euOo1PZFJ8rik1akVxNwMhYJi6AUpsGo9hY9Fme/cmaxifnWbo6c0hFyqHT7Gm95xtWzZWawvDNPRsBife4qIQfihgQjGQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1669896902; 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=uW98jd2KMQ/suLf8tq+6B3QUESjgsfbnl4f/SKMINBc=; b=Gr1ZQk0OUiDJldYmHy4wGaWGPEnkpM/oMdEGiwek0Ap7soNGgQ8y0rO8NEVoRw+/JvAnQ6m24qERnzbdX5Yd0gS0s9+/1PMFNhve1+0w4b+W27GtjX2zlJq78dRjMr0/AY+rt+uVxizUVCQOLrKmtr/ZHVjdWolOPPtyhCY07BM= 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 1669896902254977.2083182429506; Thu, 1 Dec 2022 04:15:02 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p0iPr-0004FK-Er; Thu, 01 Dec 2022 07:11:47 -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 1p0iPp-0004EX-Cm for qemu-devel@nongnu.org; Thu, 01 Dec 2022 07:11:45 -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 1p0iPm-0008DC-34 for qemu-devel@nongnu.org; Thu, 01 Dec 2022 07:11:45 -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-428-ozb1GnPSORuHcG3-FDMtBw-1; Thu, 01 Dec 2022 07:11:37 -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 9E801800B23; Thu, 1 Dec 2022 12:11:37 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 31AD240C6EC4; Thu, 1 Dec 2022 12:11:37 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id DFD1521E6936; Thu, 1 Dec 2022 13:11:33 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669896701; 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=uW98jd2KMQ/suLf8tq+6B3QUESjgsfbnl4f/SKMINBc=; b=ZKf/dilXjCywH86cDO51AJ5R813ztbq/MpKiVpRN+eoMIEMb0Ae+HmBmlYWZ+4TmMYKVo2 fQzm+dIVZ8OQZYzQvgtm0sg3aDySCi7vvk8VMdUmk64rK+pRqivgbulbd1g6Clxoe8BNW6 1GVXeJspPYxJVOnbjzC1eYqPpZ/PC+s= X-MC-Unique: ozb1GnPSORuHcG3-FDMtBw-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: mst@redhat.com, marcel.apfelbaum@gmail.com, dgilbert@redhat.com, philmd@linaro.org Subject: [PATCH v2 02/13] pci: Move QMP commands to new hw/pci/pci-qmp-cmds.c Date: Thu, 1 Dec 2022 13:11:22 +0100 Message-Id: <20221201121133.3813857-3-armbru@redhat.com> In-Reply-To: <20221201121133.3813857-1-armbru@redhat.com> References: <20221201121133.3813857-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: 1669896903326100002 Content-Type: text/plain; charset="utf-8" Signed-off-by: Markus Armbruster Reviewed-by: Michael S. Tsirkin --- hw/pci/pci-internal.h | 20 +++++ hw/pci/pci-qmp-cmds.c | 201 ++++++++++++++++++++++++++++++++++++++++++ hw/pci/pci.c | 188 +-------------------------------------- hw/pci/meson.build | 1 + 4 files changed, 226 insertions(+), 184 deletions(-) create mode 100644 hw/pci/pci-internal.h create mode 100644 hw/pci/pci-qmp-cmds.c diff --git a/hw/pci/pci-internal.h b/hw/pci/pci-internal.h new file mode 100644 index 0000000000..4903a26cbf --- /dev/null +++ b/hw/pci/pci-internal.h @@ -0,0 +1,20 @@ +#ifndef HW_PCI_PCI_INTERNAL_H +#define HW_PCI_PCI_INTERNAL_H + +#include "qemu/queue.h" + +typedef struct { + uint16_t class; + const char *desc; + const char *fw_name; + uint16_t fw_ign_bits; +} pci_class_desc; + +typedef QLIST_HEAD(, PCIHostState) PCIHostStateList; + +extern PCIHostStateList pci_host_bridges; + +const pci_class_desc *get_class_desc(int class); +PCIBus *pci_find_bus_nr(PCIBus *bus, int bus_num); + +#endif diff --git a/hw/pci/pci-qmp-cmds.c b/hw/pci/pci-qmp-cmds.c new file mode 100644 index 0000000000..4b434dcfda --- /dev/null +++ b/hw/pci/pci-qmp-cmds.c @@ -0,0 +1,201 @@ +/* + * QMP commands related to PCI + * + * Copyright (c) 2004 Fabrice Bellard + * + * Permission is hereby granted, free of charge, to any person obtaining a= copy + * of this software and associated documentation files (the "Software"), t= o deal + * in the Software without restriction, including without limitation the r= ights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or se= ll + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included= in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS= OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OT= HER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING= FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS = IN + * THE SOFTWARE. + */ + +#include "qemu/osdep.h" +#include "hw/pci/pci.h" +#include "hw/pci/pci_bridge.h" +#include "pci-internal.h" +#include "qapi/qapi-commands-pci.h" + +static PciDeviceInfoList *qmp_query_pci_devices(PCIBus *bus, int bus_num); + +static PciMemoryRegionList *qmp_query_pci_regions(const PCIDevice *dev) +{ + PciMemoryRegionList *head =3D NULL, **tail =3D &head; + int i; + + for (i =3D 0; i < PCI_NUM_REGIONS; i++) { + const PCIIORegion *r =3D &dev->io_regions[i]; + PciMemoryRegion *region; + + if (!r->size) { + continue; + } + + region =3D g_malloc0(sizeof(*region)); + + if (r->type & PCI_BASE_ADDRESS_SPACE_IO) { + region->type =3D g_strdup("io"); + } else { + region->type =3D g_strdup("memory"); + region->has_prefetch =3D true; + region->prefetch =3D !!(r->type & PCI_BASE_ADDRESS_MEM_PREFETC= H); + region->has_mem_type_64 =3D true; + region->mem_type_64 =3D !!(r->type & PCI_BASE_ADDRESS_MEM_TYPE= _64); + } + + region->bar =3D i; + region->address =3D r->addr; + region->size =3D r->size; + + QAPI_LIST_APPEND(tail, region); + } + + return head; +} + +static PciBridgeInfo *qmp_query_pci_bridge(PCIDevice *dev, PCIBus *bus, + int bus_num) +{ + PciBridgeInfo *info; + PciMemoryRange *range; + + info =3D g_new0(PciBridgeInfo, 1); + + info->bus =3D g_new0(PciBusInfo, 1); + info->bus->number =3D dev->config[PCI_PRIMARY_BUS]; + info->bus->secondary =3D dev->config[PCI_SECONDARY_BUS]; + info->bus->subordinate =3D dev->config[PCI_SUBORDINATE_BUS]; + + range =3D info->bus->io_range =3D g_new0(PciMemoryRange, 1); + range->base =3D pci_bridge_get_base(dev, PCI_BASE_ADDRESS_SPACE_IO); + range->limit =3D pci_bridge_get_limit(dev, PCI_BASE_ADDRESS_SPACE_IO); + + range =3D info->bus->memory_range =3D g_new0(PciMemoryRange, 1); + range->base =3D pci_bridge_get_base(dev, PCI_BASE_ADDRESS_SPACE_MEMORY= ); + range->limit =3D pci_bridge_get_limit(dev, PCI_BASE_ADDRESS_SPACE_MEMO= RY); + + range =3D info->bus->prefetchable_range =3D g_new0(PciMemoryRange, 1); + range->base =3D pci_bridge_get_base(dev, PCI_BASE_ADDRESS_MEM_PREFETCH= ); + range->limit =3D pci_bridge_get_limit(dev, PCI_BASE_ADDRESS_MEM_PREFET= CH); + + if (dev->config[PCI_SECONDARY_BUS] !=3D 0) { + PCIBus *child_bus =3D pci_find_bus_nr(bus, + dev->config[PCI_SECONDARY_BUS]= ); + if (child_bus) { + info->has_devices =3D true; + info->devices =3D qmp_query_pci_devices(child_bus, + dev->config[PCI_SECONDARY_BUS]= ); + } + } + + return info; +} + +static PciDeviceInfo *qmp_query_pci_device(PCIDevice *dev, PCIBus *bus, + int bus_num) +{ + const pci_class_desc *desc; + PciDeviceInfo *info; + uint8_t type; + int class; + + info =3D g_new0(PciDeviceInfo, 1); + info->bus =3D bus_num; + info->slot =3D PCI_SLOT(dev->devfn); + info->function =3D PCI_FUNC(dev->devfn); + + info->class_info =3D g_new0(PciDeviceClass, 1); + class =3D pci_get_word(dev->config + PCI_CLASS_DEVICE); + info->class_info->q_class =3D class; + desc =3D get_class_desc(class); + if (desc->desc) { + info->class_info->has_desc =3D true; + info->class_info->desc =3D g_strdup(desc->desc); + } + + info->id =3D g_new0(PciDeviceId, 1); + info->id->vendor =3D pci_get_word(dev->config + PCI_VENDOR_ID); + info->id->device =3D pci_get_word(dev->config + PCI_DEVICE_ID); + info->regions =3D qmp_query_pci_regions(dev); + info->qdev_id =3D g_strdup(dev->qdev.id ? dev->qdev.id : ""); + + info->irq_pin =3D dev->config[PCI_INTERRUPT_PIN]; + if (dev->config[PCI_INTERRUPT_PIN] !=3D 0) { + info->has_irq =3D true; + info->irq =3D dev->config[PCI_INTERRUPT_LINE]; + } + + type =3D dev->config[PCI_HEADER_TYPE] & ~PCI_HEADER_TYPE_MULTI_FUNCTIO= N; + if (type =3D=3D PCI_HEADER_TYPE_BRIDGE) { + info->has_pci_bridge =3D true; + info->pci_bridge =3D qmp_query_pci_bridge(dev, bus, bus_num); + } else if (type =3D=3D PCI_HEADER_TYPE_NORMAL) { + info->id->has_subsystem =3D info->id->has_subsystem_vendor =3D tru= e; + info->id->subsystem =3D pci_get_word(dev->config + PCI_SUBSYSTEM_I= D); + info->id->subsystem_vendor =3D + pci_get_word(dev->config + PCI_SUBSYSTEM_VENDOR_ID); + } else if (type =3D=3D PCI_HEADER_TYPE_CARDBUS) { + info->id->has_subsystem =3D info->id->has_subsystem_vendor =3D tru= e; + info->id->subsystem =3D pci_get_word(dev->config + PCI_CB_SUBSYSTE= M_ID); + info->id->subsystem_vendor =3D + pci_get_word(dev->config + PCI_CB_SUBSYSTEM_VENDOR_ID); + } + + return info; +} + +static PciDeviceInfoList *qmp_query_pci_devices(PCIBus *bus, int bus_num) +{ + PciDeviceInfoList *head =3D NULL, **tail =3D &head; + PCIDevice *dev; + int devfn; + + for (devfn =3D 0; devfn < ARRAY_SIZE(bus->devices); devfn++) { + dev =3D bus->devices[devfn]; + if (dev) { + QAPI_LIST_APPEND(tail, qmp_query_pci_device(dev, bus, bus_num)= ); + } + } + + return head; +} + +static PciInfo *qmp_query_pci_bus(PCIBus *bus, int bus_num) +{ + PciInfo *info =3D NULL; + + bus =3D pci_find_bus_nr(bus, bus_num); + if (bus) { + info =3D g_malloc0(sizeof(*info)); + info->bus =3D bus_num; + info->devices =3D qmp_query_pci_devices(bus, bus_num); + } + + return info; +} + +PciInfoList *qmp_query_pci(Error **errp) +{ + PciInfoList *head =3D NULL, **tail =3D &head; + PCIHostState *host_bridge; + + QLIST_FOREACH(host_bridge, &pci_host_bridges, next) { + QAPI_LIST_APPEND(tail, + qmp_query_pci_bus(host_bridge->bus, + pci_bus_num(host_bridge->bus))); + } + + return head; +} diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 53ed447115..81ffc74925 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -47,8 +47,8 @@ #include "hw/hotplug.h" #include "hw/boards.h" #include "qapi/error.h" -#include "qapi/qapi-commands-pci.h" #include "qemu/cutils.h" +#include "pci-internal.h" =20 //#define DEBUG_PCI #ifdef DEBUG_PCI @@ -234,7 +234,6 @@ static const TypeInfo cxl_bus_info =3D { .class_init =3D pcie_bus_class_init, }; =20 -static PCIBus *pci_find_bus_nr(PCIBus *bus, int bus_num); static void pci_update_mappings(PCIDevice *d); static void pci_irq_handler(void *opaque, int irq_num, int level); static void pci_add_option_rom(PCIDevice *pdev, bool is_default_rom, Error= **); @@ -243,7 +242,7 @@ static void pci_del_option_rom(PCIDevice *pdev); static uint16_t pci_default_sub_vendor_id =3D PCI_SUBVENDOR_ID_REDHAT_QUMR= ANET; static uint16_t pci_default_sub_device_id =3D PCI_SUBDEVICE_ID_QEMU; =20 -static QLIST_HEAD(, PCIHostState) pci_host_bridges; +PCIHostStateList pci_host_bridges; =20 int pci_bar(PCIDevice *d, int reg) { @@ -1662,13 +1661,6 @@ int pci_swizzle_map_irq_fn(PCIDevice *pci_dev, int p= in) /***********************************************************/ /* monitor info on PCI */ =20 -typedef struct { - uint16_t class; - const char *desc; - const char *fw_name; - uint16_t fw_ign_bits; -} pci_class_desc; - static const pci_class_desc pci_class_descriptions[] =3D { { 0x0001, "VGA controller", "display"}, @@ -1776,7 +1768,7 @@ void pci_for_each_device(PCIBus *bus, int bus_num, } } =20 -static const pci_class_desc *get_class_desc(int class) +const pci_class_desc *get_class_desc(int class) { const pci_class_desc *desc; =20 @@ -1788,178 +1780,6 @@ static const pci_class_desc *get_class_desc(int cla= ss) return desc; } =20 -static PciDeviceInfoList *qmp_query_pci_devices(PCIBus *bus, int bus_num); - -static PciMemoryRegionList *qmp_query_pci_regions(const PCIDevice *dev) -{ - PciMemoryRegionList *head =3D NULL, **tail =3D &head; - int i; - - for (i =3D 0; i < PCI_NUM_REGIONS; i++) { - const PCIIORegion *r =3D &dev->io_regions[i]; - PciMemoryRegion *region; - - if (!r->size) { - continue; - } - - region =3D g_malloc0(sizeof(*region)); - - if (r->type & PCI_BASE_ADDRESS_SPACE_IO) { - region->type =3D g_strdup("io"); - } else { - region->type =3D g_strdup("memory"); - region->has_prefetch =3D true; - region->prefetch =3D !!(r->type & PCI_BASE_ADDRESS_MEM_PREFETC= H); - region->has_mem_type_64 =3D true; - region->mem_type_64 =3D !!(r->type & PCI_BASE_ADDRESS_MEM_TYPE= _64); - } - - region->bar =3D i; - region->address =3D r->addr; - region->size =3D r->size; - - QAPI_LIST_APPEND(tail, region); - } - - return head; -} - -static PciBridgeInfo *qmp_query_pci_bridge(PCIDevice *dev, PCIBus *bus, - int bus_num) -{ - PciBridgeInfo *info; - PciMemoryRange *range; - - info =3D g_new0(PciBridgeInfo, 1); - - info->bus =3D g_new0(PciBusInfo, 1); - info->bus->number =3D dev->config[PCI_PRIMARY_BUS]; - info->bus->secondary =3D dev->config[PCI_SECONDARY_BUS]; - info->bus->subordinate =3D dev->config[PCI_SUBORDINATE_BUS]; - - range =3D info->bus->io_range =3D g_new0(PciMemoryRange, 1); - range->base =3D pci_bridge_get_base(dev, PCI_BASE_ADDRESS_SPACE_IO); - range->limit =3D pci_bridge_get_limit(dev, PCI_BASE_ADDRESS_SPACE_IO); - - range =3D info->bus->memory_range =3D g_new0(PciMemoryRange, 1); - range->base =3D pci_bridge_get_base(dev, PCI_BASE_ADDRESS_SPACE_MEMORY= ); - range->limit =3D pci_bridge_get_limit(dev, PCI_BASE_ADDRESS_SPACE_MEMO= RY); - - range =3D info->bus->prefetchable_range =3D g_new0(PciMemoryRange, 1); - range->base =3D pci_bridge_get_base(dev, PCI_BASE_ADDRESS_MEM_PREFETCH= ); - range->limit =3D pci_bridge_get_limit(dev, PCI_BASE_ADDRESS_MEM_PREFET= CH); - - if (dev->config[PCI_SECONDARY_BUS] !=3D 0) { - PCIBus *child_bus =3D pci_find_bus_nr(bus, - dev->config[PCI_SECONDARY_BUS]= ); - if (child_bus) { - info->has_devices =3D true; - info->devices =3D qmp_query_pci_devices(child_bus, - dev->config[PCI_SECONDARY_BUS]= ); - } - } - - return info; -} - -static PciDeviceInfo *qmp_query_pci_device(PCIDevice *dev, PCIBus *bus, - int bus_num) -{ - const pci_class_desc *desc; - PciDeviceInfo *info; - uint8_t type; - int class; - - info =3D g_new0(PciDeviceInfo, 1); - info->bus =3D bus_num; - info->slot =3D PCI_SLOT(dev->devfn); - info->function =3D PCI_FUNC(dev->devfn); - - info->class_info =3D g_new0(PciDeviceClass, 1); - class =3D pci_get_word(dev->config + PCI_CLASS_DEVICE); - info->class_info->q_class =3D class; - desc =3D get_class_desc(class); - if (desc->desc) { - info->class_info->has_desc =3D true; - info->class_info->desc =3D g_strdup(desc->desc); - } - - info->id =3D g_new0(PciDeviceId, 1); - info->id->vendor =3D pci_get_word(dev->config + PCI_VENDOR_ID); - info->id->device =3D pci_get_word(dev->config + PCI_DEVICE_ID); - info->regions =3D qmp_query_pci_regions(dev); - info->qdev_id =3D g_strdup(dev->qdev.id ? dev->qdev.id : ""); - - info->irq_pin =3D dev->config[PCI_INTERRUPT_PIN]; - if (dev->config[PCI_INTERRUPT_PIN] !=3D 0) { - info->has_irq =3D true; - info->irq =3D dev->config[PCI_INTERRUPT_LINE]; - } - - type =3D dev->config[PCI_HEADER_TYPE] & ~PCI_HEADER_TYPE_MULTI_FUNCTIO= N; - if (type =3D=3D PCI_HEADER_TYPE_BRIDGE) { - info->has_pci_bridge =3D true; - info->pci_bridge =3D qmp_query_pci_bridge(dev, bus, bus_num); - } else if (type =3D=3D PCI_HEADER_TYPE_NORMAL) { - info->id->has_subsystem =3D info->id->has_subsystem_vendor =3D tru= e; - info->id->subsystem =3D pci_get_word(dev->config + PCI_SUBSYSTEM_I= D); - info->id->subsystem_vendor =3D - pci_get_word(dev->config + PCI_SUBSYSTEM_VENDOR_ID); - } else if (type =3D=3D PCI_HEADER_TYPE_CARDBUS) { - info->id->has_subsystem =3D info->id->has_subsystem_vendor =3D tru= e; - info->id->subsystem =3D pci_get_word(dev->config + PCI_CB_SUBSYSTE= M_ID); - info->id->subsystem_vendor =3D - pci_get_word(dev->config + PCI_CB_SUBSYSTEM_VENDOR_ID); - } - - return info; -} - -static PciDeviceInfoList *qmp_query_pci_devices(PCIBus *bus, int bus_num) -{ - PciDeviceInfoList *head =3D NULL, **tail =3D &head; - PCIDevice *dev; - int devfn; - - for (devfn =3D 0; devfn < ARRAY_SIZE(bus->devices); devfn++) { - dev =3D bus->devices[devfn]; - if (dev) { - QAPI_LIST_APPEND(tail, qmp_query_pci_device(dev, bus, bus_num)= ); - } - } - - return head; -} - -static PciInfo *qmp_query_pci_bus(PCIBus *bus, int bus_num) -{ - PciInfo *info =3D NULL; - - bus =3D pci_find_bus_nr(bus, bus_num); - if (bus) { - info =3D g_malloc0(sizeof(*info)); - info->bus =3D bus_num; - info->devices =3D qmp_query_pci_devices(bus, bus_num); - } - - return info; -} - -PciInfoList *qmp_query_pci(Error **errp) -{ - PciInfoList *head =3D NULL, **tail =3D &head; - PCIHostState *host_bridge; - - QLIST_FOREACH(host_bridge, &pci_host_bridges, next) { - QAPI_LIST_APPEND(tail, - qmp_query_pci_bus(host_bridge->bus, - pci_bus_num(host_bridge->bus))); - } - - return head; -} - /* Initialize a PCI NIC. */ PCIDevice *pci_nic_init_nofail(NICInfo *nd, PCIBus *rootbus, const char *default_model, @@ -2108,7 +1928,7 @@ static bool pci_root_bus_in_range(PCIBus *bus, int bu= s_num) return false; } =20 -static PCIBus *pci_find_bus_nr(PCIBus *bus, int bus_num) +PCIBus *pci_find_bus_nr(PCIBus *bus, int bus_num) { PCIBus *sec; =20 diff --git a/hw/pci/meson.build b/hw/pci/meson.build index 5aff7ed1c6..40721f1514 100644 --- a/hw/pci/meson.build +++ b/hw/pci/meson.build @@ -5,6 +5,7 @@ pci_ss.add(files( 'pci.c', 'pci_bridge.c', 'pci_host.c', + 'pci-qmp-cmds.c', 'pcie_sriov.c', 'shpc.c', 'slotid_cap.c' --=20 2.37.3 From nobody Tue May 7 14:32:24 2024 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=1669896971; cv=none; d=zohomail.com; s=zohoarc; b=eGAGgA89PtGygHKv7D9X0fbUprciAQONfJxPw4QJk//0myJomMF7cnzA40EzURYc3rUruJqGfsXq/sArmXBExgo7mRss9UXuofvOBg9iyPF50iQxrpTDemiLArzKfjSqlXjkgmi8y8zE1/4dg4L9eSSq6GEQkyOWAm1lqCJsOSE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1669896971; 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=TUh34wM+uM+wFsENXX8xs6SFf+Ste+VdB492vGd0gM8=; b=k10GMAPxN9x1KNkKmPulLGeVVQ7kEy/Pt5kV9OTucAf8O1Z5ChZEd5M16nP7V9s536mT2yR4nsfGq+VBYkkEHfLdBUoBOjXDa2JJi3zaTi4rL+qDpNT/XHqhFnpgeir9kEHOUw04WVL018h3HNARh9+NoMbrm2fMoXaTFULcheQ= 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 1669896971357172.036039039716; Thu, 1 Dec 2022 04:16:11 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p0iQ8-0004Qo-ID; Thu, 01 Dec 2022 07:12:04 -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 1p0iPx-0004IQ-5C for qemu-devel@nongnu.org; Thu, 01 Dec 2022 07:11:53 -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 1p0iPm-0008DB-3G for qemu-devel@nongnu.org; Thu, 01 Dec 2022 07:11:52 -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-428-1aqDnGTvPt-cYpAFkr9jIw-1; Thu, 01 Dec 2022 07:11:37 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7C7F1101A54E; Thu, 1 Dec 2022 12:11:37 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2EABF4EA4B; Thu, 1 Dec 2022 12:11:37 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id E2D3F21E66CD; Thu, 1 Dec 2022 13:11:33 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669896701; 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=TUh34wM+uM+wFsENXX8xs6SFf+Ste+VdB492vGd0gM8=; b=NLOVi15yF1AmO1ylrKw76UTNhdY8XvJMt3JKolccU0hSNjrXzMdrcflUjlD3EaImJGx2Qs 5jP53Cp0533Eex+2ITNYnaDx+mj0/McZw0ni3fIKuX7PvAYWz9w67zsovwoRvWc0QaG6n7 j87d4jHs3xExvXr6QIFslasrazglYTs= X-MC-Unique: 1aqDnGTvPt-cYpAFkr9jIw-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: mst@redhat.com, marcel.apfelbaum@gmail.com, dgilbert@redhat.com, philmd@linaro.org Subject: [PATCH v2 03/13] pci: Move HMP commands from monitor/ to new hw/pci/pci-hmp-cmds.c Date: Thu, 1 Dec 2022 13:11:23 +0100 Message-Id: <20221201121133.3813857-4-armbru@redhat.com> In-Reply-To: <20221201121133.3813857-1-armbru@redhat.com> References: <20221201121133.3813857-1-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 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, 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: 1669896973669100003 This moves these commands from MAINTAINERS section "Human Monitor (HMP)" to "PCI". Signed-off-by: Markus Armbruster Reviewed-by: Michael S. Tsirkin Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Dr. David Alan Gilbert --- hw/pci/pci-hmp-cmds.c | 126 ++++++++++++++++++++++++++++++++++++++++++ monitor/hmp-cmds.c | 107 ----------------------------------- hw/pci/meson.build | 1 + 3 files changed, 127 insertions(+), 107 deletions(-) create mode 100644 hw/pci/pci-hmp-cmds.c diff --git a/hw/pci/pci-hmp-cmds.c b/hw/pci/pci-hmp-cmds.c new file mode 100644 index 0000000000..5adfe4f57f --- /dev/null +++ b/hw/pci/pci-hmp-cmds.c @@ -0,0 +1,126 @@ +/* + * HMP commands related to PCI + * + * Copyright IBM, Corp. 2011 + * + * Authors: + * Anthony Liguori + * + * This work is licensed under the terms of the GNU GPL, version 2. See + * the COPYING file in the top-level directory. + * + * Contributions after 2012-01-13 are licensed under the terms of the + * GNU GPL, version 2 or (at your option) any later version. + */ + +#include "qemu/osdep.h" +#include "monitor/hmp.h" +#include "monitor/monitor.h" +#include "qapi/error.h" +#include "qapi/qapi-commands-pci.h" + +static void hmp_info_pci_device(Monitor *mon, const PciDeviceInfo *dev) +{ + PciMemoryRegionList *region; + + monitor_printf(mon, " Bus %2" PRId64 ", ", dev->bus); + monitor_printf(mon, "device %3" PRId64 ", function %" PRId64 ":\n", + dev->slot, dev->function); + monitor_printf(mon, " "); + + if (dev->class_info->has_desc) { + monitor_puts(mon, dev->class_info->desc); + } else { + monitor_printf(mon, "Class %04" PRId64, dev->class_info->q_class); + } + + monitor_printf(mon, ": PCI device %04" PRIx64 ":%04" PRIx64 "\n", + dev->id->vendor, dev->id->device); + if (dev->id->has_subsystem_vendor && dev->id->has_subsystem) { + monitor_printf(mon, " PCI subsystem %04" PRIx64 ":%04" PRIx64= "\n", + dev->id->subsystem_vendor, dev->id->subsystem); + } + + if (dev->has_irq) { + monitor_printf(mon, " IRQ %" PRId64 ", pin %c\n", + dev->irq, (char)('A' + dev->irq_pin - 1)); + } + + if (dev->has_pci_bridge) { + monitor_printf(mon, " BUS %" PRId64 ".\n", + dev->pci_bridge->bus->number); + monitor_printf(mon, " secondary bus %" PRId64 ".\n", + dev->pci_bridge->bus->secondary); + monitor_printf(mon, " subordinate bus %" PRId64 ".\n", + dev->pci_bridge->bus->subordinate); + + monitor_printf(mon, " IO range [0x%04"PRIx64", 0x%04"PRIx64"]= \n", + dev->pci_bridge->bus->io_range->base, + dev->pci_bridge->bus->io_range->limit); + + monitor_printf(mon, + " memory range [0x%08"PRIx64", 0x%08"PRIx64"]\= n", + dev->pci_bridge->bus->memory_range->base, + dev->pci_bridge->bus->memory_range->limit); + + monitor_printf(mon, " prefetchable memory range " + "[0x%08"PRIx64", 0x%08"PRIx64"]\n", + dev->pci_bridge->bus->prefetchable_range->base, + dev->pci_bridge->bus->prefetchable_range->limit); + } + + for (region =3D dev->regions; region; region =3D region->next) { + uint64_t addr, size; + + addr =3D region->value->address; + size =3D region->value->size; + + monitor_printf(mon, " BAR%" PRId64 ": ", region->value->bar); + + if (!strcmp(region->value->type, "io")) { + monitor_printf(mon, "I/O at 0x%04" PRIx64 + " [0x%04" PRIx64 "].\n", + addr, addr + size - 1); + } else { + monitor_printf(mon, "%d bit%s memory at 0x%08" PRIx64 + " [0x%08" PRIx64 "].\n", + region->value->mem_type_64 ? 64 : 32, + region->value->prefetch ? " prefetchable" : "", + addr, addr + size - 1); + } + } + + monitor_printf(mon, " id \"%s\"\n", dev->qdev_id); + + if (dev->has_pci_bridge) { + if (dev->pci_bridge->has_devices) { + PciDeviceInfoList *cdev; + for (cdev =3D dev->pci_bridge->devices; cdev; cdev =3D cdev->n= ext) { + hmp_info_pci_device(mon, cdev->value); + } + } + } +} + +void hmp_info_pci(Monitor *mon, const QDict *qdict) +{ + PciInfoList *info_list, *info; + Error *err =3D NULL; + + info_list =3D qmp_query_pci(&err); + if (err) { + monitor_printf(mon, "PCI devices not supported\n"); + error_free(err); + return; + } + + for (info =3D info_list; info; info =3D info->next) { + PciDeviceInfoList *dev; + + for (dev =3D info->value->devices; dev; dev =3D dev->next) { + hmp_info_pci_device(mon, dev->value); + } + } + + qapi_free_PciInfoList(info_list); +} diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c index 01b789a79e..03eae10663 100644 --- a/monitor/hmp-cmds.c +++ b/monitor/hmp-cmds.c @@ -37,7 +37,6 @@ #include "qapi/qapi-commands-migration.h" #include "qapi/qapi-commands-misc.h" #include "qapi/qapi-commands-net.h" -#include "qapi/qapi-commands-pci.h" #include "qapi/qapi-commands-rocker.h" #include "qapi/qapi-commands-run-state.h" #include "qapi/qapi-commands-stats.h" @@ -701,89 +700,6 @@ void hmp_info_balloon(Monitor *mon, const QDict *qdict) qapi_free_BalloonInfo(info); } =20 -static void hmp_info_pci_device(Monitor *mon, const PciDeviceInfo *dev) -{ - PciMemoryRegionList *region; - - monitor_printf(mon, " Bus %2" PRId64 ", ", dev->bus); - monitor_printf(mon, "device %3" PRId64 ", function %" PRId64 ":\n", - dev->slot, dev->function); - monitor_printf(mon, " "); - - if (dev->class_info->has_desc) { - monitor_puts(mon, dev->class_info->desc); - } else { - monitor_printf(mon, "Class %04" PRId64, dev->class_info->q_class); - } - - monitor_printf(mon, ": PCI device %04" PRIx64 ":%04" PRIx64 "\n", - dev->id->vendor, dev->id->device); - if (dev->id->has_subsystem_vendor && dev->id->has_subsystem) { - monitor_printf(mon, " PCI subsystem %04" PRIx64 ":%04" PRIx64= "\n", - dev->id->subsystem_vendor, dev->id->subsystem); - } - - if (dev->has_irq) { - monitor_printf(mon, " IRQ %" PRId64 ", pin %c\n", - dev->irq, (char)('A' + dev->irq_pin - 1)); - } - - if (dev->has_pci_bridge) { - monitor_printf(mon, " BUS %" PRId64 ".\n", - dev->pci_bridge->bus->number); - monitor_printf(mon, " secondary bus %" PRId64 ".\n", - dev->pci_bridge->bus->secondary); - monitor_printf(mon, " subordinate bus %" PRId64 ".\n", - dev->pci_bridge->bus->subordinate); - - monitor_printf(mon, " IO range [0x%04"PRIx64", 0x%04"PRIx64"]= \n", - dev->pci_bridge->bus->io_range->base, - dev->pci_bridge->bus->io_range->limit); - - monitor_printf(mon, - " memory range [0x%08"PRIx64", 0x%08"PRIx64"]\= n", - dev->pci_bridge->bus->memory_range->base, - dev->pci_bridge->bus->memory_range->limit); - - monitor_printf(mon, " prefetchable memory range " - "[0x%08"PRIx64", 0x%08"PRIx64"]\n", - dev->pci_bridge->bus->prefetchable_range->base, - dev->pci_bridge->bus->prefetchable_range->limit); - } - - for (region =3D dev->regions; region; region =3D region->next) { - uint64_t addr, size; - - addr =3D region->value->address; - size =3D region->value->size; - - monitor_printf(mon, " BAR%" PRId64 ": ", region->value->bar); - - if (!strcmp(region->value->type, "io")) { - monitor_printf(mon, "I/O at 0x%04" PRIx64 - " [0x%04" PRIx64 "].\n", - addr, addr + size - 1); - } else { - monitor_printf(mon, "%d bit%s memory at 0x%08" PRIx64 - " [0x%08" PRIx64 "].\n", - region->value->mem_type_64 ? 64 : 32, - region->value->prefetch ? " prefetchable" : "", - addr, addr + size - 1); - } - } - - monitor_printf(mon, " id \"%s\"\n", dev->qdev_id); - - if (dev->has_pci_bridge) { - if (dev->pci_bridge->has_devices) { - PciDeviceInfoList *cdev; - for (cdev =3D dev->pci_bridge->devices; cdev; cdev =3D cdev->n= ext) { - hmp_info_pci_device(mon, cdev->value); - } - } - } -} - static int hmp_info_pic_foreach(Object *obj, void *opaque) { InterruptStatsProvider *intc; @@ -810,29 +726,6 @@ void hmp_info_pic(Monitor *mon, const QDict *qdict) hmp_info_pic_foreach, mon); } =20 -void hmp_info_pci(Monitor *mon, const QDict *qdict) -{ - PciInfoList *info_list, *info; - Error *err =3D NULL; - - info_list =3D qmp_query_pci(&err); - if (err) { - monitor_printf(mon, "PCI devices not supported\n"); - error_free(err); - return; - } - - for (info =3D info_list; info; info =3D info->next) { - PciDeviceInfoList *dev; - - for (dev =3D info->value->devices; dev; dev =3D dev->next) { - hmp_info_pci_device(mon, dev->value); - } - } - - qapi_free_PciInfoList(info_list); -} - void hmp_info_tpm(Monitor *mon, const QDict *qdict) { #ifdef CONFIG_TPM diff --git a/hw/pci/meson.build b/hw/pci/meson.build index 40721f1514..e42a133f3a 100644 --- a/hw/pci/meson.build +++ b/hw/pci/meson.build @@ -20,3 +20,4 @@ softmmu_ss.add_all(when: 'CONFIG_PCI', if_true: pci_ss) =20 softmmu_ss.add(when: 'CONFIG_PCI', if_false: files('pci-stub.c')) softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('pci-stub.c')) +softmmu_ss.add(files('pci-hmp-cmds.c')) --=20 2.37.3 From nobody Tue May 7 14:32:24 2024 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=1669896747; cv=none; d=zohomail.com; s=zohoarc; b=ZabNOY5/kFc40L4JWfienQ6gYZkp6zvBEXbASLx7IkFSU3Tb8LThwE4LLzJGiMmxVP+mG0QAbL8Q9PMpN2vjhzTdwLvd2ylR5EWe6xLj5SO2WBY08QzAdv8Tc77i+fqdExOsuPOBzs9OYnc3MTnMUUlm4kNiwhtQvAZA0jhLFeY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1669896747; 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=YixPRplXpwk1IUhyR7iCRWD6GAOzLbqkxOvf6Rkgyt4=; b=RRlq76OQ9ILoZUfrtbWlAzXI3KcaeEI23KZ5RDE7ayEzdTkOyv/i7fuUnj0ux3YK9vAMkvkGdC5mMzQMU94nq6GhgTlTSgm8p1KIqpRrkCt1md1c/Q/CLr7kYAcu/JLgVjoJEUaixuQP5t+HDalSENT3amQBmDuZEDJvEpTI5Hc= 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 1669896747183238.54856985000447; Thu, 1 Dec 2022 04:12:27 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p0iPo-0004EM-UD; Thu, 01 Dec 2022 07:11:44 -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 1p0iPn-0004Dy-7F for qemu-devel@nongnu.org; Thu, 01 Dec 2022 07:11:43 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p0iPl-0008D0-08 for qemu-devel@nongnu.org; Thu, 01 Dec 2022 07:11:42 -0500 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-227-HzsFXjvMN9yzz5zXlqDEZA-1; Thu, 01 Dec 2022 07:11:37 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5D39C29AB402; Thu, 1 Dec 2022 12:11:37 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2EDEA2166B49; Thu, 1 Dec 2022 12:11:37 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id E561C21E6681; Thu, 1 Dec 2022 13:11:33 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669896698; 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=YixPRplXpwk1IUhyR7iCRWD6GAOzLbqkxOvf6Rkgyt4=; b=jH4IAiCPW6vywgw12WgK4DXNU9l9H3stpVUk6LnNxXXcmKBRsLHvNcoxoX29jN2KkUdiH5 EMrXbH2P0OyujMZn2X3a5TXMV9GHYDIiE3P2BpUK1xDQIr5Dkj1AhLc8x4rW4/bwkUtL0w iJO85r/sOTcmpm6I++J0GR5gRKrcWKI= X-MC-Unique: HzsFXjvMN9yzz5zXlqDEZA-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: mst@redhat.com, marcel.apfelbaum@gmail.com, dgilbert@redhat.com, philmd@linaro.org Subject: [PATCH v2 04/13] pci: Make query-pci stub consistent with the real one Date: Thu, 1 Dec 2022 13:11:24 +0100 Message-Id: <20221201121133.3813857-5-armbru@redhat.com> In-Reply-To: <20221201121133.3813857-1-armbru@redhat.com> References: <20221201121133.3813857-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 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.129.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, 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: 1669896748290100003 Content-Type: text/plain; charset="utf-8" QMP query-pci and HMP info pci can behave differently when there are no PCI devices. They can report nothing, like this: qemu-system-aarch64 -S -M spitz -display none -monitor stdio QEMU 7.1.91 monitor - type 'help' for more information (qemu) info pci Or they can fail, like this: qemu-system-microblaze -M petalogix-s3adsp1800 -display none -monitor s= tdio QEMU 7.1.91 monitor - type 'help' for more information (qemu) info pci PCI devices not supported They fail when none of the target's machines supports PCI, i.e. when we're using qmp_query_pci() from hw/pci/pci-stub.c. The error is not useful, and reporting nothing makes sense, so do that in pci-stub.c, too. Now qmp_query_pci() can't fail anymore. Drop the dead error handling from hmp_info_pci(). Signed-off-by: Markus Armbruster Reviewed-by: Michael S. Tsirkin Reviewed-by: Dr. David Alan Gilbert --- hw/pci/pci-hmp-cmds.c | 8 +------- hw/pci/pci-stub.c | 3 --- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/hw/pci/pci-hmp-cmds.c b/hw/pci/pci-hmp-cmds.c index 5adfe4f57f..e915fb9fe7 100644 --- a/hw/pci/pci-hmp-cmds.c +++ b/hw/pci/pci-hmp-cmds.c @@ -105,14 +105,8 @@ static void hmp_info_pci_device(Monitor *mon, const Pc= iDeviceInfo *dev) void hmp_info_pci(Monitor *mon, const QDict *qdict) { PciInfoList *info_list, *info; - Error *err =3D NULL; =20 - info_list =3D qmp_query_pci(&err); - if (err) { - monitor_printf(mon, "PCI devices not supported\n"); - error_free(err); - return; - } + info_list =3D qmp_query_pci(&error_abort); =20 for (info =3D info_list; info; info =3D info->next) { PciDeviceInfoList *dev; diff --git a/hw/pci/pci-stub.c b/hw/pci/pci-stub.c index 3a027c42e4..f29ecc999e 100644 --- a/hw/pci/pci-stub.c +++ b/hw/pci/pci-stub.c @@ -21,9 +21,7 @@ #include "qemu/osdep.h" #include "sysemu/sysemu.h" #include "monitor/monitor.h" -#include "qapi/error.h" #include "qapi/qapi-commands-pci.h" -#include "qapi/qmp/qerror.h" #include "hw/pci/pci.h" #include "hw/pci/msi.h" #include "hw/pci/msix.h" @@ -33,7 +31,6 @@ bool pci_available; =20 PciInfoList *qmp_query_pci(Error **errp) { - error_setg(errp, QERR_UNSUPPORTED); return NULL; } =20 --=20 2.37.3 From nobody Tue May 7 14:32:24 2024 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=1669896786; cv=none; d=zohomail.com; s=zohoarc; b=FWPXpsZZuN0ORevUOAPpXcLD92pqKoVqSB/vX7gzdYbp7IJvpeISAJ0zJzC3PZoxXAFNbQ23S4yooAal9TMQjohRxXdPoaa5wsfgY/buDjHuGTJIN/nnIhOLy6LSCjYLTGRdtydxW2/UoCTj2eehQ8BglAGASgbtnNc9gdVTIRQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1669896786; 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=HCQQWR6OE//u4jmobVnxU1mb59eYSYdJnhdFdBpeGko=; b=VrGUpBx6RxxwpsLNWvNcwxD9hs5vT3/EvdMzfEVVtrtrXdd8k3FcHN5kVLyJtXDsWkmgFt/PD1LQeHqQj4PeJftmFwxI0eiZqZtmdcNLT8oXM0EgfD6UcI3O9nie9fnMid6BdSw1Dc3fqFaAsLChfZCpnyVlmb6DyzxgbVMlbWI= 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 1669896786889100.17866241499837; Thu, 1 Dec 2022 04:13:06 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p0iPt-0004GE-Bk; Thu, 01 Dec 2022 07:11:49 -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 1p0iPr-0004FT-Bq for qemu-devel@nongnu.org; Thu, 01 Dec 2022 07:11:47 -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 1p0iPn-0008DS-Cm for qemu-devel@nongnu.org; Thu, 01 Dec 2022 07:11:47 -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-614-Z97TneULObCIhx2bRZ4vqA-1; Thu, 01 Dec 2022 07:11:41 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C730D833AEE; Thu, 1 Dec 2022 12:11:40 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9C6D2111F3D9; Thu, 1 Dec 2022 12:11:40 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id E7EB621E65C5; Thu, 1 Dec 2022 13:11:33 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669896702; 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=HCQQWR6OE//u4jmobVnxU1mb59eYSYdJnhdFdBpeGko=; b=KlAiT8b8iyTHPUOLY/aSuhU4zSdbmP7XzKhPOsxl7Mp8VzSZXF0/bliv95oVHKkiQZvhKE rWxGV2bgtOfjNuJaPZ52QvV+4yiS6P1xjhGYuMQLBSvC3gXflkXteW61mEX+GGKuY+EWPd Adlk3KpTbhw15DNEyZjjYrVqHTlWnMI= X-MC-Unique: Z97TneULObCIhx2bRZ4vqA-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: mst@redhat.com, marcel.apfelbaum@gmail.com, dgilbert@redhat.com, philmd@linaro.org Subject: [PATCH v2 05/13] pci: Build hw/pci/pci-hmp-cmds.c only when CONFIG_PCI Date: Thu, 1 Dec 2022 13:11:25 +0100 Message-Id: <20221201121133.3813857-6-armbru@redhat.com> In-Reply-To: <20221201121133.3813857-1-armbru@redhat.com> References: <20221201121133.3813857-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 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: 1669896788397100005 Content-Type: text/plain; charset="utf-8" We compile pci-hmp-cmds.c always, but pci-qmp-cmds.c only when CONFIG_PCI. hw/pci/pci-stub.c keeps the linker happy when !CONFIG_PCI. Build pci-hmp-cmds.c that way, too. Signed-off-by: Markus Armbruster Reviewed-by: Michael S. Tsirkin --- hw/pci/pci-stub.c | 5 +++++ hw/pci/meson.build | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/hw/pci/pci-stub.c b/hw/pci/pci-stub.c index f29ecc999e..01d20a2f67 100644 --- a/hw/pci/pci-stub.c +++ b/hw/pci/pci-stub.c @@ -21,6 +21,7 @@ #include "qemu/osdep.h" #include "sysemu/sysemu.h" #include "monitor/monitor.h" +#include "monitor/hmp.h" #include "qapi/qapi-commands-pci.h" #include "hw/pci/pci.h" #include "hw/pci/msi.h" @@ -34,6 +35,10 @@ PciInfoList *qmp_query_pci(Error **errp) return NULL; } =20 +void hmp_info_pci(Monitor *mon, const QDict *qdict) +{ +} + void hmp_pcie_aer_inject_error(Monitor *mon, const QDict *qdict) { monitor_printf(mon, "PCI devices not supported\n"); diff --git a/hw/pci/meson.build b/hw/pci/meson.build index e42a133f3a..4fcd888b27 100644 --- a/hw/pci/meson.build +++ b/hw/pci/meson.build @@ -5,6 +5,7 @@ pci_ss.add(files( 'pci.c', 'pci_bridge.c', 'pci_host.c', + 'pci-hmp-cmds.c', 'pci-qmp-cmds.c', 'pcie_sriov.c', 'shpc.c', @@ -20,4 +21,3 @@ softmmu_ss.add_all(when: 'CONFIG_PCI', if_true: pci_ss) =20 softmmu_ss.add(when: 'CONFIG_PCI', if_false: files('pci-stub.c')) softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('pci-stub.c')) -softmmu_ss.add(files('pci-hmp-cmds.c')) --=20 2.37.3 From nobody Tue May 7 14:32:24 2024 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=1669896786; cv=none; d=zohomail.com; s=zohoarc; b=a213FSoF+sHGL18CHMYR/QjxFP+U3rXCSu05a0yLQwYFNkTZIootwrj60Phw/QfJjQAQcTiJWmA9IGG8ZbvAJHuJdlSwpf2MFdaaA5+lB693/fcat3fBFJM5+EHe+CEUuBJz8TFAjEEaEhS+Jpb/mfBCnTu1OgBnoQGkjkU2qtM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1669896786; 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=Bo6eSUCYwbNcIR7fgts3/7sGembR8IS5DU9WUNQvpIs=; b=MJ4LY3eaJSHfus0coxhyXqd+s9Aa6C5bxakOcNDT2gJ8roGbqvVuSpEY8aow85WSuR+hscgPFuD9KYoKV8xsuAeuOgxC+yu7FN0Ml0kEanTJVI6F6qw4QbS2VNWMWtg12W2Tl5L4ibRcu0938IlsBWuT0XgSg/4NPDnweySyLPU= 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 166989678678711.538453993085227; Thu, 1 Dec 2022 04:13:06 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p0iPx-0004IN-9H; Thu, 01 Dec 2022 07:11:53 -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 1p0iPq-0004FB-Hz for qemu-devel@nongnu.org; Thu, 01 Dec 2022 07:11:46 -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 1p0iPn-0008DT-58 for qemu-devel@nongnu.org; Thu, 01 Dec 2022 07:11:46 -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-370-xeATRJ-rPqe-vhGAaxyysg-1; Thu, 01 Dec 2022 07:11:41 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C77E6800B23; Thu, 1 Dec 2022 12:11:40 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9BEA6140EBF5; Thu, 1 Dec 2022 12:11:40 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id EA93321E65C6; Thu, 1 Dec 2022 13:11:33 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669896702; 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=Bo6eSUCYwbNcIR7fgts3/7sGembR8IS5DU9WUNQvpIs=; b=gwF+wSby/ajGCF9I1+WZlz5YVPs6pwCI8/0H8nkaX4tRa5CfhH4rD+wRRbm7rXEgdseKOb p355YwihNMbJ4EReSPMulJmDhmZ6oop9pL0Crvw7hqV7aGfE+hwM/LJw6CNX669qVvV6To +zh6bqcjF6ejPRYjwdHS+LsnYQh7om8= X-MC-Unique: xeATRJ-rPqe-vhGAaxyysg-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: mst@redhat.com, marcel.apfelbaum@gmail.com, dgilbert@redhat.com, philmd@linaro.org Subject: [PATCH v2 06/13] pci: Deduplicate get_class_desc() Date: Thu, 1 Dec 2022 13:11:26 +0100 Message-Id: <20221201121133.3813857-7-armbru@redhat.com> In-Reply-To: <20221201121133.3813857-1-armbru@redhat.com> References: <20221201121133.3813857-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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: 1669896788367100003 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 --- 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 81ffc74925..6711a75098 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 From nobody Tue May 7 14:32:24 2024 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=1669896997; cv=none; d=zohomail.com; s=zohoarc; b=IVMWUUrFy4CG1xl87Fz2sCJYNvfwGYExc8ZmNcnPrfj5pa35IAPO0uGdLOZP2hG97tzEygfrIScK6/ZcAUoenPqwo8gfZEAKEjZr+k15acjDXnePhNa1rorVCVfxU8LDO0nwoTjOuOodM+Fu3Rzvx5KXs2G8nvk+DpWEL9u8jds= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1669896997; 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=ZOPSFKv4asr2lcldz5C2hFJmsrW0ZXIyej6ff92ohNs=; b=i4G78hLJoSBPRx06Ywfl3MiaTEVziCbj+48ByJxXtuLQNkDWmY5K8RSljcyBX+M3Ikc2feauL2Qs5AgRqkKFrWqDX7EvAPwvHL9VPjo1y0QrOrveoKpEW7SXfb7/RyrOLcvSetXtqI6RsQMaC0JjYI8Xjba0HlTA7foxaE9x/2Y= 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 166989699709298.31342847582232; Thu, 1 Dec 2022 04:16:37 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p0iPz-0004Ju-BS; Thu, 01 Dec 2022 07:11:55 -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 1p0iPt-0004GD-7u for qemu-devel@nongnu.org; Thu, 01 Dec 2022 07:11:49 -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 1p0iPp-0008FE-1O for qemu-devel@nongnu.org; Thu, 01 Dec 2022 07:11:48 -0500 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-44-1Gq2wMlQP0SJnENIXTTi9Q-1; Thu, 01 Dec 2022 07:11:41 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EBB681C05ECB; Thu, 1 Dec 2022 12:11:40 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9C7012166B49; Thu, 1 Dec 2022 12:11:40 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id ED13C21E65C7; Thu, 1 Dec 2022 13:11:33 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669896704; 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=ZOPSFKv4asr2lcldz5C2hFJmsrW0ZXIyej6ff92ohNs=; b=cmWA3B0Nhk+18Z5RTmC2Qy3S8WwivTCTZCso/M7Buho09HhsfQILczCSlzNLMEW7bG2uC2 3UkRm0p4rYBmDpuIDvVrYicHwTlV4kMExu5q8ZQCSZuO8N3JwDEAmR/rgNCdPFp0oBtGme +R0VjDvyO98sk3F3c4LOkEGK/xXguQQ= X-MC-Unique: 1Gq2wMlQP0SJnENIXTTi9Q-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: mst@redhat.com, marcel.apfelbaum@gmail.com, dgilbert@redhat.com, philmd@linaro.org Subject: [PATCH v2 07/13] pci: Move pcibus_dev_print() to pci-hmp-cmds.c Date: Thu, 1 Dec 2022 13:11:27 +0100 Message-Id: <20221201121133.3813857-8-armbru@redhat.com> In-Reply-To: <20221201121133.3813857-1-armbru@redhat.com> References: <20221201121133.3813857-1-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 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: 1669896997747100002 This method is for HMP command "info qtree". Signed-off-by: Markus Armbruster Reviewed-by: Michael S. Tsirkin Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/pci/pci-internal.h | 1 + hw/pci/pci-hmp-cmds.c | 38 ++++++++++++++++++++++++++++++++++++++ hw/pci/pci.c | 38 -------------------------------------- 3 files changed, 39 insertions(+), 38 deletions(-) diff --git a/hw/pci/pci-internal.h b/hw/pci/pci-internal.h index 4903a26cbf..3199615e50 100644 --- a/hw/pci/pci-internal.h +++ b/hw/pci/pci-internal.h @@ -16,5 +16,6 @@ extern PCIHostStateList pci_host_bridges; =20 const pci_class_desc *get_class_desc(int class); PCIBus *pci_find_bus_nr(PCIBus *bus, int bus_num); +void pcibus_dev_print(Monitor *mon, DeviceState *dev, int indent); =20 #endif diff --git a/hw/pci/pci-hmp-cmds.c b/hw/pci/pci-hmp-cmds.c index e915fb9fe7..417f1ca607 100644 --- a/hw/pci/pci-hmp-cmds.c +++ b/hw/pci/pci-hmp-cmds.c @@ -14,8 +14,10 @@ */ =20 #include "qemu/osdep.h" +#include "hw/pci/pci.h" #include "monitor/hmp.h" #include "monitor/monitor.h" +#include "pci-internal.h" #include "qapi/error.h" #include "qapi/qapi-commands-pci.h" =20 @@ -118,3 +120,39 @@ void hmp_info_pci(Monitor *mon, const QDict *qdict) =20 qapi_free_PciInfoList(info_list); } + +void pcibus_dev_print(Monitor *mon, DeviceState *dev, int indent) +{ + PCIDevice *d =3D (PCIDevice *)dev; + 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; + + if (desc->desc) { + snprintf(ctxt, sizeof(ctxt), "%s", desc->desc); + } else { + snprintf(ctxt, sizeof(ctxt), "Class %04x", class); + } + + monitor_printf(mon, "%*sclass %s, addr %02x:%02x.%x, " + "pci id %04x:%04x (sub %04x:%04x)\n", + indent, "", ctxt, pci_dev_bus_num(d), + PCI_SLOT(d->devfn), PCI_FUNC(d->devfn), + pci_get_word(d->config + PCI_VENDOR_ID), + pci_get_word(d->config + PCI_DEVICE_ID), + pci_get_word(d->config + PCI_SUBSYSTEM_VENDOR_ID), + pci_get_word(d->config + PCI_SUBSYSTEM_ID)); + for (i =3D 0; i < PCI_NUM_REGIONS; i++) { + r =3D &d->io_regions[i]; + if (!r->size) { + continue; + } + monitor_printf(mon, "%*sbar %d: %s at 0x%"FMT_PCIBUS + " [0x%"FMT_PCIBUS"]\n", + indent, "", + i, r->type & PCI_BASE_ADDRESS_SPACE_IO ? "i/o" : "m= em", + r->addr, r->addr + r->size - 1); + } +} diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 6711a75098..d654045fe9 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -34,7 +34,6 @@ #include "hw/qdev-properties-system.h" #include "migration/qemu-file-types.h" #include "migration/vmstate.h" -#include "monitor/monitor.h" #include "net/net.h" #include "sysemu/numa.h" #include "sysemu/sysemu.h" @@ -59,7 +58,6 @@ =20 bool pci_available =3D true; =20 -static void pcibus_dev_print(Monitor *mon, DeviceState *dev, int indent); static char *pcibus_get_dev_path(DeviceState *dev); static char *pcibus_get_fw_dev_path(DeviceState *dev); static void pcibus_reset(BusState *qbus); @@ -2406,42 +2404,6 @@ uint8_t pci_find_capability(PCIDevice *pdev, uint8_t= cap_id) return pci_find_capability_list(pdev, cap_id, NULL); } =20 -static void pcibus_dev_print(Monitor *mon, DeviceState *dev, int indent) -{ - PCIDevice *d =3D (PCIDevice *)dev; - 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; - - if (desc->desc) { - snprintf(ctxt, sizeof(ctxt), "%s", desc->desc); - } else { - snprintf(ctxt, sizeof(ctxt), "Class %04x", class); - } - - monitor_printf(mon, "%*sclass %s, addr %02x:%02x.%x, " - "pci id %04x:%04x (sub %04x:%04x)\n", - indent, "", ctxt, pci_dev_bus_num(d), - PCI_SLOT(d->devfn), PCI_FUNC(d->devfn), - pci_get_word(d->config + PCI_VENDOR_ID), - pci_get_word(d->config + PCI_DEVICE_ID), - pci_get_word(d->config + PCI_SUBSYSTEM_VENDOR_ID), - pci_get_word(d->config + PCI_SUBSYSTEM_ID)); - for (i =3D 0; i < PCI_NUM_REGIONS; i++) { - r =3D &d->io_regions[i]; - if (!r->size) { - continue; - } - monitor_printf(mon, "%*sbar %d: %s at 0x%"FMT_PCIBUS - " [0x%"FMT_PCIBUS"]\n", - indent, "", - i, r->type & PCI_BASE_ADDRESS_SPACE_IO ? "i/o" : "m= em", - r->addr, r->addr + r->size - 1); - } -} - static char *pci_dev_fw_name(DeviceState *dev, char *buf, int len) { PCIDevice *d =3D (PCIDevice *)dev; --=20 2.37.3 From nobody Tue May 7 14:32:24 2024 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=1669896728; cv=none; d=zohomail.com; s=zohoarc; b=FDdZmNruCbqlXUMjnlKLnhIH8rk0SBXc6m+zikq5iIQy2mlLkFMPK+AMR/ZxtOOX0FJg7uQUOX3ZPSA33xjE/7UACXkOA9DwuGmbK4UxTikIFwu36K45Ftfb98ob8TrdahRauwjtPTrJRcVSv/Ov1R6/+gMNQNz+ppYzjnwG0ME= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1669896728; 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=sErs+hFif7dUYgG6dZCxbdYwYQR+mQT5Cu7U+0bbapg=; b=gKKBr+D7FFAiAIPpE3N64zU0vEPLwlzLHwbJzibMFLp5xOlc+hqlRbXsvqR6/t682u+qMHwIizgaiTZo4c6iC0UsXOZFdBe6/phj6r93DeevRgpG+4qm22fFYq5eubJ5LlmL7NOyCko6R3nu98u6mzISOkjbao+qDOjPEkv3ks4= 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 1669896728623753.3107835166293; Thu, 1 Dec 2022 04:12:08 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p0iPv-0004I4-Jm; Thu, 01 Dec 2022 07:11:52 -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 1p0iPr-0004Fg-Mj for qemu-devel@nongnu.org; Thu, 01 Dec 2022 07:11:47 -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 1p0iPp-0008FA-0N for qemu-devel@nongnu.org; Thu, 01 Dec 2022 07:11:47 -0500 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-42-_shhHcUBNM2RQqk-JihxBQ-1; Thu, 01 Dec 2022 07:11:41 -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 C65931C05EBD; Thu, 1 Dec 2022 12:11:40 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9C02740C6EC4; Thu, 1 Dec 2022 12:11:40 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id EF7C321E65C8; Thu, 1 Dec 2022 13:11:33 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669896704; 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=sErs+hFif7dUYgG6dZCxbdYwYQR+mQT5Cu7U+0bbapg=; b=hcHm6F8Ev6Y6bptJ4fhzfl1laYS6YWkEMU0cXAPjK7MN/3qVQaLUUYZY+iR41SQYOWjYvm GoODt8alhPWdDU/KUSBFVNqyYvbtMLQQTBaq/cJtu4xJVSACluPvMx/qOuPBVgbACxXLbK xO56Q+tjQE7sxoUIC7Zn+Bug3jhCBNQ= X-MC-Unique: _shhHcUBNM2RQqk-JihxBQ-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: mst@redhat.com, marcel.apfelbaum@gmail.com, dgilbert@redhat.com, philmd@linaro.org Subject: [PATCH v2 08/13] pci: Fix silent truncation of pcie_aer_inject_error argument Date: Thu, 1 Dec 2022 13:11:28 +0100 Message-Id: <20221201121133.3813857-9-armbru@redhat.com> In-Reply-To: <20221201121133.3813857-1-armbru@redhat.com> References: <20221201121133.3813857-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: 1669896730079100003 Content-Type: text/plain; charset="utf-8" PCI AER error status is 32 bit. The HMP command supports both symbolic and numeric error status: anything that isn't a known symbolic value is parsed as number with strtol(). Issues: * Empty argument yields value zero. * Range errors from strtol() are ignored, value is UINT32_MAX. * Values not representable in uint32_t are silently truncated. Fix to reject such input by switching to strtoui(). Signed-off-by: Markus Armbruster Reviewed-by: Michael S. Tsirkin --- hw/pci/pcie_aer.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/hw/pci/pcie_aer.c b/hw/pci/pcie_aer.c index eff62f3945..58d20816d6 100644 --- a/hw/pci/pcie_aer.c +++ b/hw/pci/pcie_aer.c @@ -30,6 +30,7 @@ #include "hw/pci/pci_bus.h" #include "hw/pci/pcie_regs.h" #include "qapi/error.h" +#include "qemu/cutils.h" =20 //#define DEBUG_PCIE #ifdef DEBUG_PCIE @@ -963,6 +964,7 @@ static int do_pcie_aer_inject_error(Monitor *mon, const char *id =3D qdict_get_str(qdict, "id"); const char *error_name; uint32_t error_status; + unsigned int num; bool correctable; PCIDevice *dev; PCIEAERErr err; @@ -983,14 +985,13 @@ static int do_pcie_aer_inject_error(Monitor *mon, =20 error_name =3D qdict_get_str(qdict, "error_status"); if (pcie_aer_parse_error_string(error_name, &error_status, &correctabl= e)) { - char *e =3D NULL; - error_status =3D strtoul(error_name, &e, 0); - correctable =3D qdict_get_try_bool(qdict, "correctable", false); - if (!e || *e !=3D '\0') { + if (qemu_strtoui(error_name, NULL, 0, &num) < 0) { monitor_printf(mon, "invalid error status value. \"%s\"", error_name); return -EINVAL; } + error_status =3D num; + correctable =3D qdict_get_try_bool(qdict, "correctable", false); } err.status =3D error_status; err.source_id =3D pci_requester_id(dev); --=20 2.37.3 From nobody Tue May 7 14:32:24 2024 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=1669896965; cv=none; d=zohomail.com; s=zohoarc; b=e1LFTKV+gtZoFTNxEo9cReQgTofIg4jNnoj1NNeNnpha2Cr/PIa/GG3acgxSY+eLzbAwNoNkh4mrAVElxPpeXJwAv6cwcfqpo45mCBfwN8ubXD7K/zzx0MB1zIRYvPqThbq69D02H7/ANtmCy1nOqSsKfo/kfbGX3lX7pZ4sFWE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1669896965; 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=m/dojx9mJjT6SjfFaw/m9Wj8qEDEB9lSvDGDQNyndEs=; b=NEHR6GpFYHvCDkTy2LMTZ1kewqsJwDl3lHsK3YnNT11ryO6Zum9q3Q7y5Dgy5jSosxwdtIFOqisYvVlHSYa6kJHqboe7vOMoxN8J0+zQ88ZyDrq9bkYvMggcLHNkUb6RH3VRgWCS0EQnBtweRxNfloRbt711KR4WJF1SyqbnKeM= 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 1669896965314126.31039778159504; Thu, 1 Dec 2022 04:16:05 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p0iQ8-0004Ox-AT; Thu, 01 Dec 2022 07:12:04 -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 1p0iPv-0004I8-8u for qemu-devel@nongnu.org; Thu, 01 Dec 2022 07:11:51 -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 1p0iPr-0008Gq-2G for qemu-devel@nongnu.org; Thu, 01 Dec 2022 07:11:50 -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-614-av1gvR5vNv2i4GoaK5cZIQ-1; Thu, 01 Dec 2022 07:11:41 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E4CC5894E8B; Thu, 1 Dec 2022 12:11:40 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9C040111F3BB; Thu, 1 Dec 2022 12:11:40 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id F21DE21E65C9; Thu, 1 Dec 2022 13:11:33 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669896706; 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=m/dojx9mJjT6SjfFaw/m9Wj8qEDEB9lSvDGDQNyndEs=; b=JXXGBnZHQWZeBGpdiVbjDthND4lWNKjPWQrbLCsXAER57cW9BdXFta2960ajKxu1BVQPGS dGkigIKHKEZUfwK7YKGGv33h2nWsMJ4HDkkS/8HPhC5UhDRGwrUhr8exlPScET0KRlf7rC lyOk8woE0M/RjSFfk9dhL71zMNJwnIY= X-MC-Unique: av1gvR5vNv2i4GoaK5cZIQ-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: mst@redhat.com, marcel.apfelbaum@gmail.com, dgilbert@redhat.com, philmd@linaro.org Subject: [PATCH v2 09/13] pci: Move HMP command from hw/pci/pcie_aer.c to pci-hmp-cmds.c Date: Thu, 1 Dec 2022 13:11:29 +0100 Message-Id: <20221201121133.3813857-10-armbru@redhat.com> In-Reply-To: <20221201121133.3813857-1-armbru@redhat.com> References: <20221201121133.3813857-1-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 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: 1669896967667100002 Signed-off-by: Markus Armbruster Reviewed-by: Michael S. Tsirkin Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/pci/pci-internal.h | 4 ++ include/monitor/hmp.h | 1 + include/sysemu/sysemu.h | 3 -- hw/pci/pci-hmp-cmds.c | 104 ++++++++++++++++++++++++++++++++++++ hw/pci/pci-stub.c | 1 - hw/pci/pcie_aer.c | 114 ++-------------------------------------- 6 files changed, 113 insertions(+), 114 deletions(-) diff --git a/hw/pci/pci-internal.h b/hw/pci/pci-internal.h index 3199615e50..2ea356bdf5 100644 --- a/hw/pci/pci-internal.h +++ b/hw/pci/pci-internal.h @@ -18,4 +18,8 @@ const pci_class_desc *get_class_desc(int class); PCIBus *pci_find_bus_nr(PCIBus *bus, int bus_num); void pcibus_dev_print(Monitor *mon, DeviceState *dev, int indent); =20 +int pcie_aer_parse_error_string(const char *error_name, + uint32_t *status, bool *correctable); +int pcie_aer_inject_error(PCIDevice *dev, const PCIEAERErr *err); + #endif diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h index dfbc0c9a2f..27f86399f7 100644 --- a/include/monitor/hmp.h +++ b/include/monitor/hmp.h @@ -143,5 +143,6 @@ void hmp_info_vcpu_dirty_limit(Monitor *mon, const QDic= t *qdict); void hmp_human_readable_text_helper(Monitor *mon, HumanReadableText *(*qmp_handler)(Erro= r **)); void hmp_info_stats(Monitor *mon, const QDict *qdict); +void hmp_pcie_aer_inject_error(Monitor *mon, const QDict *qdict); =20 #endif diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index 6a7a31e64d..25be2a692e 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -61,9 +61,6 @@ extern int nb_option_roms; extern const char *prom_envs[MAX_PROM_ENVS]; extern unsigned int nb_prom_envs; =20 -/* pcie aer error injection */ -void hmp_pcie_aer_inject_error(Monitor *mon, const QDict *qdict); - /* serial ports */ =20 /* Return the Chardev for serial port i, or NULL if none */ diff --git a/hw/pci/pci-hmp-cmds.c b/hw/pci/pci-hmp-cmds.c index 417f1ca607..ae75b920aa 100644 --- a/hw/pci/pci-hmp-cmds.c +++ b/hw/pci/pci-hmp-cmds.c @@ -19,7 +19,9 @@ #include "monitor/monitor.h" #include "pci-internal.h" #include "qapi/error.h" +#include "qapi/qmp/qdict.h" #include "qapi/qapi-commands-pci.h" +#include "qemu/cutils.h" =20 static void hmp_info_pci_device(Monitor *mon, const PciDeviceInfo *dev) { @@ -156,3 +158,105 @@ void pcibus_dev_print(Monitor *mon, DeviceState *dev,= int indent) r->addr, r->addr + r->size - 1); } } + +typedef struct PCIEErrorDetails { + const char *id; + const char *root_bus; + int bus; + int devfn; +} PCIEErrorDetails; + +/* + * Inject an error described by @qdict. + * On success, set @details to show where error was sent. + * Return negative errno if injection failed and a message was emitted. + */ +static int do_pcie_aer_inject_error(Monitor *mon, + const QDict *qdict, + PCIEErrorDetails *details) +{ + const char *id =3D qdict_get_str(qdict, "id"); + const char *error_name; + uint32_t error_status; + unsigned int num; + bool correctable; + PCIDevice *dev; + PCIEAERErr err; + int ret; + + ret =3D pci_qdev_find_device(id, &dev); + if (ret < 0) { + monitor_printf(mon, + "id or pci device path is invalid or device not " + "found. %s\n", id); + return ret; + } + if (!pci_is_express(dev)) { + monitor_printf(mon, "the device doesn't support pci express. %s\n", + id); + return -ENOSYS; + } + + error_name =3D qdict_get_str(qdict, "error_status"); + if (pcie_aer_parse_error_string(error_name, &error_status, &correctabl= e)) { + if (qemu_strtoui(error_name, NULL, 0, &num) < 0) { + monitor_printf(mon, "invalid error status value. \"%s\"", + error_name); + return -EINVAL; + } + error_status =3D num; + correctable =3D qdict_get_try_bool(qdict, "correctable", false); + } + err.status =3D error_status; + err.source_id =3D pci_requester_id(dev); + + err.flags =3D 0; + if (correctable) { + err.flags |=3D PCIE_AER_ERR_IS_CORRECTABLE; + } + if (qdict_get_try_bool(qdict, "advisory_non_fatal", false)) { + err.flags |=3D PCIE_AER_ERR_MAYBE_ADVISORY; + } + if (qdict_haskey(qdict, "header0")) { + err.flags |=3D PCIE_AER_ERR_HEADER_VALID; + } + if (qdict_haskey(qdict, "prefix0")) { + err.flags |=3D PCIE_AER_ERR_TLP_PREFIX_PRESENT; + } + + err.header[0] =3D qdict_get_try_int(qdict, "header0", 0); + err.header[1] =3D qdict_get_try_int(qdict, "header1", 0); + err.header[2] =3D qdict_get_try_int(qdict, "header2", 0); + err.header[3] =3D qdict_get_try_int(qdict, "header3", 0); + + err.prefix[0] =3D qdict_get_try_int(qdict, "prefix0", 0); + err.prefix[1] =3D qdict_get_try_int(qdict, "prefix1", 0); + err.prefix[2] =3D qdict_get_try_int(qdict, "prefix2", 0); + err.prefix[3] =3D qdict_get_try_int(qdict, "prefix3", 0); + + ret =3D pcie_aer_inject_error(dev, &err); + if (ret < 0) { + monitor_printf(mon, "failed to inject error: %s\n", + strerror(-ret)); + return ret; + } + details->id =3D id; + details->root_bus =3D pci_root_bus_path(dev); + details->bus =3D pci_dev_bus_num(dev); + details->devfn =3D dev->devfn; + + return 0; +} + +void hmp_pcie_aer_inject_error(Monitor *mon, const QDict *qdict) +{ + PCIEErrorDetails data; + + if (do_pcie_aer_inject_error(mon, qdict, &data) < 0) { + return; + } + + monitor_printf(mon, "OK id: %s root bus: %s, bus: %x devfn: %x.%x\n", + data.id, data.root_bus, data.bus, + PCI_SLOT(data.devfn), PCI_FUNC(data.devfn)); +} diff --git a/hw/pci/pci-stub.c b/hw/pci/pci-stub.c index 01d20a2f67..f0508682d2 100644 --- a/hw/pci/pci-stub.c +++ b/hw/pci/pci-stub.c @@ -19,7 +19,6 @@ */ =20 #include "qemu/osdep.h" -#include "sysemu/sysemu.h" #include "monitor/monitor.h" #include "monitor/hmp.h" #include "qapi/qapi-commands-pci.h" diff --git a/hw/pci/pcie_aer.c b/hw/pci/pcie_aer.c index 58d20816d6..9a19be44ae 100644 --- a/hw/pci/pcie_aer.c +++ b/hw/pci/pcie_aer.c @@ -19,18 +19,14 @@ */ =20 #include "qemu/osdep.h" -#include "sysemu/sysemu.h" -#include "qapi/qmp/qdict.h" #include "migration/vmstate.h" -#include "monitor/monitor.h" #include "hw/pci/pci_bridge.h" #include "hw/pci/pcie.h" #include "hw/pci/msix.h" #include "hw/pci/msi.h" #include "hw/pci/pci_bus.h" #include "hw/pci/pcie_regs.h" -#include "qapi/error.h" -#include "qemu/cutils.h" +#include "pci-internal.h" =20 //#define DEBUG_PCIE #ifdef DEBUG_PCIE @@ -45,13 +41,6 @@ #define PCI_ERR_SRC_COR_OFFS 0 #define PCI_ERR_SRC_UNCOR_OFFS 2 =20 -typedef struct PCIEErrorDetails { - const char *id; - const char *root_bus; - int bus; - int devfn; -} PCIEErrorDetails; - /* From 6.2.7 Error Listing and Rules. Table 6-2, 6-3 and 6-4 */ static uint32_t pcie_aer_uncor_default_severity(uint32_t status) { @@ -632,7 +621,7 @@ static bool pcie_aer_inject_uncor_error(PCIEAERInject *= inj, bool is_fatal) * Figure 6-2: Flowchart Showing Sequence of Device Error Signaling and Lo= gging * Operations */ -static int pcie_aer_inject_error(PCIDevice *dev, const PCIEAERErr *err) +int pcie_aer_inject_error(PCIDevice *dev, const PCIEAERErr *err) { uint8_t *aer_cap =3D NULL; uint16_t devctl =3D 0; @@ -934,8 +923,8 @@ static const struct PCIEAERErrorName pcie_aer_error_lis= t[] =3D { }, }; =20 -static int pcie_aer_parse_error_string(const char *error_name, - uint32_t *status, bool *correctable) +int pcie_aer_parse_error_string(const char *error_name, + uint32_t *status, bool *correctable) { int i; =20 @@ -951,98 +940,3 @@ static int pcie_aer_parse_error_string(const char *err= or_name, } return -EINVAL; } - -/* - * Inject an error described by @qdict. - * On success, set @details to show where error was sent. - * Return negative errno if injection failed and a message was emitted. - */ -static int do_pcie_aer_inject_error(Monitor *mon, - const QDict *qdict, - PCIEErrorDetails *details) -{ - const char *id =3D qdict_get_str(qdict, "id"); - const char *error_name; - uint32_t error_status; - unsigned int num; - bool correctable; - PCIDevice *dev; - PCIEAERErr err; - int ret; - - ret =3D pci_qdev_find_device(id, &dev); - if (ret < 0) { - monitor_printf(mon, - "id or pci device path is invalid or device not " - "found. %s\n", id); - return ret; - } - if (!pci_is_express(dev)) { - monitor_printf(mon, "the device doesn't support pci express. %s\n", - id); - return -ENOSYS; - } - - error_name =3D qdict_get_str(qdict, "error_status"); - if (pcie_aer_parse_error_string(error_name, &error_status, &correctabl= e)) { - if (qemu_strtoui(error_name, NULL, 0, &num) < 0) { - monitor_printf(mon, "invalid error status value. \"%s\"", - error_name); - return -EINVAL; - } - error_status =3D num; - correctable =3D qdict_get_try_bool(qdict, "correctable", false); - } - err.status =3D error_status; - err.source_id =3D pci_requester_id(dev); - - err.flags =3D 0; - if (correctable) { - err.flags |=3D PCIE_AER_ERR_IS_CORRECTABLE; - } - if (qdict_get_try_bool(qdict, "advisory_non_fatal", false)) { - err.flags |=3D PCIE_AER_ERR_MAYBE_ADVISORY; - } - if (qdict_haskey(qdict, "header0")) { - err.flags |=3D PCIE_AER_ERR_HEADER_VALID; - } - if (qdict_haskey(qdict, "prefix0")) { - err.flags |=3D PCIE_AER_ERR_TLP_PREFIX_PRESENT; - } - - err.header[0] =3D qdict_get_try_int(qdict, "header0", 0); - err.header[1] =3D qdict_get_try_int(qdict, "header1", 0); - err.header[2] =3D qdict_get_try_int(qdict, "header2", 0); - err.header[3] =3D qdict_get_try_int(qdict, "header3", 0); - - err.prefix[0] =3D qdict_get_try_int(qdict, "prefix0", 0); - err.prefix[1] =3D qdict_get_try_int(qdict, "prefix1", 0); - err.prefix[2] =3D qdict_get_try_int(qdict, "prefix2", 0); - err.prefix[3] =3D qdict_get_try_int(qdict, "prefix3", 0); - - ret =3D pcie_aer_inject_error(dev, &err); - if (ret < 0) { - monitor_printf(mon, "failed to inject error: %s\n", - strerror(-ret)); - return ret; - } - details->id =3D id; - details->root_bus =3D pci_root_bus_path(dev); - details->bus =3D pci_dev_bus_num(dev); - details->devfn =3D dev->devfn; - - return 0; -} - -void hmp_pcie_aer_inject_error(Monitor *mon, const QDict *qdict) -{ - PCIEErrorDetails data; - - if (do_pcie_aer_inject_error(mon, qdict, &data) < 0) { - return; - } - - monitor_printf(mon, "OK id: %s root bus: %s, bus: %x devfn: %x.%x\n", - data.id, data.root_bus, data.bus, - PCI_SLOT(data.devfn), PCI_FUNC(data.devfn)); -} --=20 2.37.3 From nobody Tue May 7 14:32:24 2024 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=1669896816; cv=none; d=zohomail.com; s=zohoarc; b=gf7IH+WdjfhL6uTbCrqu6S5P24YC788PTa06o6nop3vjIWbq36l8sHehd++IvIoIb+iz1stPC6FmgA5Z45tVj14po24rgNsE0ShOdOS0Zmyr1eZAjg2XywHqEjdsyf0zFRdUo6DTZFToE+yiUtdeSbnhzLPzwYKN97TtwID6dn4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1669896816; 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=FuoaHqgZPopfGjoLRo1usA7dSB1m6YAgnROu6BuKS8Y=; b=HuGkbCIoms9iPwKpSFCvoPYglQhATqeQHkwpsZOhmzmIaIhmAOFC1O2QhiJgF8/ZKGaWlBknspMI7hdhy5z3vFnoFtvqvGmKBpsXz8JPrVKpuV8eDPHBljOLlG8YfcWekuLClt95xbB6R0Y5JnrpYUfabd6e+eHMv+04EAeiCR0= 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 1669896816635319.80829940215835; Thu, 1 Dec 2022 04:13:36 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p0iPy-0004Ia-PQ; Thu, 01 Dec 2022 07:11:54 -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 1p0iPs-0004Fq-Sd for qemu-devel@nongnu.org; Thu, 01 Dec 2022 07:11:48 -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 1p0iPp-0008Ex-17 for qemu-devel@nongnu.org; Thu, 01 Dec 2022 07:11:48 -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-42-XXJgwFNFPV-6kxLzenAT0w-1; Thu, 01 Dec 2022 07:11:41 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CA75E811E84; Thu, 1 Dec 2022 12:11:40 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9C2482024CBE; Thu, 1 Dec 2022 12:11:40 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 007D021E65CA; Thu, 1 Dec 2022 13:11:33 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669896704; 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=FuoaHqgZPopfGjoLRo1usA7dSB1m6YAgnROu6BuKS8Y=; b=cKFawZJ8udAmwTQgywcnJWa9anfMPjjrGrn7lALItuI4kK91U5OHA2TkV9Sd4efgHoTvxV nE7rY0p3Cv8KMFdI9BRL86pGr8O3sbSG7IYV+ZJSVws3j6n0oO0gvEpwODZF/GUYEBMaGT chpV/7VaV9STiFR7W91AD8Jk+1cAqLE= X-MC-Unique: XXJgwFNFPV-6kxLzenAT0w-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: mst@redhat.com, marcel.apfelbaum@gmail.com, dgilbert@redhat.com, philmd@linaro.org Subject: [PATCH v2 10/13] pci: Inline do_pcie_aer_inject_error() into its only caller Date: Thu, 1 Dec 2022 13:11:30 +0100 Message-Id: <20221201121133.3813857-11-armbru@redhat.com> In-Reply-To: <20221201121133.3813857-1-armbru@redhat.com> References: <20221201121133.3813857-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 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: 1669896818614100002 Content-Type: text/plain; charset="utf-8" Signed-off-by: Markus Armbruster Reviewed-by: Michael S. Tsirkin Reviewed-by: Dr. David Alan Gilbert --- hw/pci/pci-hmp-cmds.c | 41 ++++++----------------------------------- 1 file changed, 6 insertions(+), 35 deletions(-) diff --git a/hw/pci/pci-hmp-cmds.c b/hw/pci/pci-hmp-cmds.c index ae75b920aa..a9a5bbb930 100644 --- a/hw/pci/pci-hmp-cmds.c +++ b/hw/pci/pci-hmp-cmds.c @@ -159,21 +159,7 @@ void pcibus_dev_print(Monitor *mon, DeviceState *dev, = int indent) } } =20 -typedef struct PCIEErrorDetails { - const char *id; - const char *root_bus; - int bus; - int devfn; -} PCIEErrorDetails; - -/* - * Inject an error described by @qdict. - * On success, set @details to show where error was sent. - * Return negative errno if injection failed and a message was emitted. - */ -static int do_pcie_aer_inject_error(Monitor *mon, - const QDict *qdict, - PCIEErrorDetails *details) +void hmp_pcie_aer_inject_error(Monitor *mon, const QDict *qdict) { const char *id =3D qdict_get_str(qdict, "id"); const char *error_name; @@ -189,12 +175,12 @@ static int do_pcie_aer_inject_error(Monitor *mon, monitor_printf(mon, "id or pci device path is invalid or device not " "found. %s\n", id); - return ret; + return; } if (!pci_is_express(dev)) { monitor_printf(mon, "the device doesn't support pci express. %s\n", id); - return -ENOSYS; + return; } =20 error_name =3D qdict_get_str(qdict, "error_status"); @@ -202,7 +188,7 @@ static int do_pcie_aer_inject_error(Monitor *mon, if (qemu_strtoui(error_name, NULL, 0, &num) < 0) { monitor_printf(mon, "invalid error status value. \"%s\"", error_name); - return -EINVAL; + return; } error_status =3D num; correctable =3D qdict_get_try_bool(qdict, "correctable", false); @@ -238,25 +224,10 @@ static int do_pcie_aer_inject_error(Monitor *mon, if (ret < 0) { monitor_printf(mon, "failed to inject error: %s\n", strerror(-ret)); - return ret; - } - details->id =3D id; - details->root_bus =3D pci_root_bus_path(dev); - details->bus =3D pci_dev_bus_num(dev); - details->devfn =3D dev->devfn; - - return 0; -} - -void hmp_pcie_aer_inject_error(Monitor *mon, const QDict *qdict) -{ - PCIEErrorDetails data; - - if (do_pcie_aer_inject_error(mon, qdict, &data) < 0) { return; } =20 monitor_printf(mon, "OK id: %s root bus: %s, bus: %x devfn: %x.%x\n", - data.id, data.root_bus, data.bus, - PCI_SLOT(data.devfn), PCI_FUNC(data.devfn)); + id, pci_root_bus_path(dev), pci_dev_bus_num(dev), + PCI_SLOT(dev->devfn), PCI_FUNC(dev->devfn)); } --=20 2.37.3 From nobody Tue May 7 14:32:24 2024 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=1669896872; cv=none; d=zohomail.com; s=zohoarc; b=bWDxd9iqxBNrNCeSUnDnpKDjzDb/0/9gChgCkYbCk5CrKKaQqqKuRL7LL6hlLDss5y7YWrTEiOJcsqrR1/jlX9M6Nu0gK8uJfuwTE3Q28kb75I4WlxjruB3z3ppSQ335wfsn8K0wJodJlCMfwJPzeGsmdCZUP4FJwhS4R9dZMk8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1669896872; 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=CKPLxyfrtkL83JqU6yhe4o7v0+k6SPXp13TDygLQD4k=; b=GRWgllrttIOnm/UxXzPObTosWysZaGdgBsx7jI50bq14Haeu2S5FcMvf9xI8JkZLGJ8c/+lvle5tGgNuP8IYlVkayYxS+kCvNmG7mVohgDIgAYePuY3Gz8iusY0p+NxnE78iJ0becgbhYs2xKDbkKHdVODoPQBivpYV+6Hp/Dbw= 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 1669896872632573.724209354121; Thu, 1 Dec 2022 04:14:32 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p0iPy-0004Ib-UY; Thu, 01 Dec 2022 07:11:54 -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 1p0iPt-0004GJ-CG for qemu-devel@nongnu.org; Thu, 01 Dec 2022 07:11:49 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p0iPp-0008F1-2G for qemu-devel@nongnu.org; Thu, 01 Dec 2022 07:11:49 -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-595-IjJeAkB7MtSADqdV162zjA-1; Thu, 01 Dec 2022 07:11:41 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C5368185A792; Thu, 1 Dec 2022 12:11:40 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9BF331120AA4; Thu, 1 Dec 2022 12:11:40 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 02F0F21E65CB; Thu, 1 Dec 2022 13:11:34 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669896704; 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=CKPLxyfrtkL83JqU6yhe4o7v0+k6SPXp13TDygLQD4k=; b=ZTAGHf/w5VVucHNGjdFvBq4b0jwzEP+EecqJYcbL60j0p98lIbyrbtaz2ww/eeULpKE2OA bqyJ9DvyPm/eLY/xIzeMRqApk4YKs+HNFvePQF/N0y0bU03IYacBx39zTv62RpQJNQKIIV gGNEerojdC7es4paiie5homn0MG7cbo= X-MC-Unique: IjJeAkB7MtSADqdV162zjA-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: mst@redhat.com, marcel.apfelbaum@gmail.com, dgilbert@redhat.com, philmd@linaro.org Subject: [PATCH v2 11/13] pci: Rename hmp_pcie_aer_inject_error()'s local variable @err Date: Thu, 1 Dec 2022 13:11:31 +0100 Message-Id: <20221201121133.3813857-12-armbru@redhat.com> In-Reply-To: <20221201121133.3813857-1-armbru@redhat.com> References: <20221201121133.3813857-1-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 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.129.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, 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: 1669896873142100003 I'd like to use @err for an Error *err. Rename PCIEAERErr err to aer_err. Signed-off-by: Markus Armbruster Reviewed-by: Michael S. Tsirkin Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/pci/pci-hmp-cmds.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/hw/pci/pci-hmp-cmds.c b/hw/pci/pci-hmp-cmds.c index a9a5bbb930..2dd65ca6ee 100644 --- a/hw/pci/pci-hmp-cmds.c +++ b/hw/pci/pci-hmp-cmds.c @@ -167,7 +167,7 @@ void hmp_pcie_aer_inject_error(Monitor *mon, const QDic= t *qdict) unsigned int num; bool correctable; PCIDevice *dev; - PCIEAERErr err; + PCIEAERErr aer_err; int ret; =20 ret =3D pci_qdev_find_device(id, &dev); @@ -193,34 +193,34 @@ void hmp_pcie_aer_inject_error(Monitor *mon, const QD= ict *qdict) error_status =3D num; correctable =3D qdict_get_try_bool(qdict, "correctable", false); } - err.status =3D error_status; - err.source_id =3D pci_requester_id(dev); + aer_err.status =3D error_status; + aer_err.source_id =3D pci_requester_id(dev); =20 - err.flags =3D 0; + aer_err.flags =3D 0; if (correctable) { - err.flags |=3D PCIE_AER_ERR_IS_CORRECTABLE; + aer_err.flags |=3D PCIE_AER_ERR_IS_CORRECTABLE; } if (qdict_get_try_bool(qdict, "advisory_non_fatal", false)) { - err.flags |=3D PCIE_AER_ERR_MAYBE_ADVISORY; + aer_err.flags |=3D PCIE_AER_ERR_MAYBE_ADVISORY; } if (qdict_haskey(qdict, "header0")) { - err.flags |=3D PCIE_AER_ERR_HEADER_VALID; + aer_err.flags |=3D PCIE_AER_ERR_HEADER_VALID; } if (qdict_haskey(qdict, "prefix0")) { - err.flags |=3D PCIE_AER_ERR_TLP_PREFIX_PRESENT; + aer_err.flags |=3D PCIE_AER_ERR_TLP_PREFIX_PRESENT; } =20 - err.header[0] =3D qdict_get_try_int(qdict, "header0", 0); - err.header[1] =3D qdict_get_try_int(qdict, "header1", 0); - err.header[2] =3D qdict_get_try_int(qdict, "header2", 0); - err.header[3] =3D qdict_get_try_int(qdict, "header3", 0); + aer_err.header[0] =3D qdict_get_try_int(qdict, "header0", 0); + aer_err.header[1] =3D qdict_get_try_int(qdict, "header1", 0); + aer_err.header[2] =3D qdict_get_try_int(qdict, "header2", 0); + aer_err.header[3] =3D qdict_get_try_int(qdict, "header3", 0); =20 - err.prefix[0] =3D qdict_get_try_int(qdict, "prefix0", 0); - err.prefix[1] =3D qdict_get_try_int(qdict, "prefix1", 0); - err.prefix[2] =3D qdict_get_try_int(qdict, "prefix2", 0); - err.prefix[3] =3D qdict_get_try_int(qdict, "prefix3", 0); + aer_err.prefix[0] =3D qdict_get_try_int(qdict, "prefix0", 0); + aer_err.prefix[1] =3D qdict_get_try_int(qdict, "prefix1", 0); + aer_err.prefix[2] =3D qdict_get_try_int(qdict, "prefix2", 0); + aer_err.prefix[3] =3D qdict_get_try_int(qdict, "prefix3", 0); =20 - ret =3D pcie_aer_inject_error(dev, &err); + ret =3D pcie_aer_inject_error(dev, &aer_err); if (ret < 0) { monitor_printf(mon, "failed to inject error: %s\n", strerror(-ret)); --=20 2.37.3 From nobody Tue May 7 14:32:24 2024 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=1669896805; cv=none; d=zohomail.com; s=zohoarc; b=X3FYkk5/kInTmAdyqb6K0ekUnfBVdp+pMRIiv8wCBl9zzYRb28oD5Ylje0FcRturFDQ7gEVOJLeXENL0u+/p7Y1rkopjIxzrdCXG/0KfTrHD7U1xtk+2S3hpgp0LMxrbb4dldWcXXBs3xzJYeXFF+qZBMH0EjzokTWbFXXGvA2g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1669896805; 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=Icvnjof7qTILzCzrASrlzID3IYpCq4VGLmlLsuYzzjA=; b=mizTtI8p1Kx5yuH+15NfE0f51XPKGwws8OxxcUrKi9PpVXcZIMsE5+UhQ3ttnheP54sPS221mtyXGVTE/dE2Vibq7ov6Faw0h9Ak3m7igq+ND9+uHRYwRazDAYv+FSjn5g2W/3X7JCG+9QTlsVEvoSrwmQp+TPmlDMnJApVaDRE= 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 1669896805201654.1432930725503; Thu, 1 Dec 2022 04:13:25 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p0iQA-0004V4-L9; Thu, 01 Dec 2022 07:12:06 -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 1p0iPv-0004I9-8r for qemu-devel@nongnu.org; Thu, 01 Dec 2022 07:11:51 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p0iPp-0008Ez-5c for qemu-devel@nongnu.org; Thu, 01 Dec 2022 07:11:50 -0500 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-349-Fi__bA5fMsSNiVHBTEgVog-1; Thu, 01 Dec 2022 07:11:41 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C6199380391A; Thu, 1 Dec 2022 12:11:40 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9BCCBFD48; Thu, 1 Dec 2022 12:11:40 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 0697621E65CC; Thu, 1 Dec 2022 13:11:34 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669896704; 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=Icvnjof7qTILzCzrASrlzID3IYpCq4VGLmlLsuYzzjA=; b=iQaNnH/yqnptRQMdNyVzBbxxGZb9ZJT1+BEnj0mnuD2tAtZtdCB6NZqo6CELPqABnWAJTL PXkFCHmnykIgvR/AHfKcnlpBh+0l3oOXcJnZGwgzW3yqm9VqegcWabmH8DezV7yscOuQRn v6XYtYJhHZefymQHPwk+3pJOLvvZdr0= X-MC-Unique: Fi__bA5fMsSNiVHBTEgVog-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: mst@redhat.com, marcel.apfelbaum@gmail.com, dgilbert@redhat.com, philmd@linaro.org Subject: [PATCH v2 12/13] pci: Improve do_pcie_aer_inject_error()'s error messages Date: Thu, 1 Dec 2022 13:11:32 +0100 Message-Id: <20221201121133.3813857-13-armbru@redhat.com> In-Reply-To: <20221201121133.3813857-1-armbru@redhat.com> References: <20221201121133.3813857-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 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.129.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, 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: 1669896806569100002 Content-Type: text/plain; charset="utf-8" Signed-off-by: Markus Armbruster Reviewed-by: Michael S. Tsirkin Reviewed-by: Dr. David Alan Gilbert --- hw/pci/pci-hmp-cmds.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/hw/pci/pci-hmp-cmds.c b/hw/pci/pci-hmp-cmds.c index 2dd65ca6ee..7a3175ab4b 100644 --- a/hw/pci/pci-hmp-cmds.c +++ b/hw/pci/pci-hmp-cmds.c @@ -161,6 +161,7 @@ void pcibus_dev_print(Monitor *mon, DeviceState *dev, i= nt indent) =20 void hmp_pcie_aer_inject_error(Monitor *mon, const QDict *qdict) { + Error *err =3D NULL; const char *id =3D qdict_get_str(qdict, "id"); const char *error_name; uint32_t error_status; @@ -171,24 +172,20 @@ void hmp_pcie_aer_inject_error(Monitor *mon, const QD= ict *qdict) int ret; =20 ret =3D pci_qdev_find_device(id, &dev); - if (ret < 0) { - monitor_printf(mon, - "id or pci device path is invalid or device not " - "found. %s\n", id); - return; + if (ret =3D=3D -ENODEV) { + error_setg(&err, "device '%s' not found", id); + goto out; } - if (!pci_is_express(dev)) { - monitor_printf(mon, "the device doesn't support pci express. %s\n", - id); - return; + if (ret < 0 || !pci_is_express(dev)) { + error_setg(&err, "device '%s' is not a PCIe device", id); + goto out; } =20 error_name =3D qdict_get_str(qdict, "error_status"); if (pcie_aer_parse_error_string(error_name, &error_status, &correctabl= e)) { if (qemu_strtoui(error_name, NULL, 0, &num) < 0) { - monitor_printf(mon, "invalid error status value. \"%s\"", - error_name); - return; + error_setg(&err, "invalid error status value '%s'", error_name= ); + goto out; } error_status =3D num; correctable =3D qdict_get_try_bool(qdict, "correctable", false); @@ -222,12 +219,15 @@ void hmp_pcie_aer_inject_error(Monitor *mon, const QD= ict *qdict) =20 ret =3D pcie_aer_inject_error(dev, &aer_err); if (ret < 0) { - monitor_printf(mon, "failed to inject error: %s\n", - strerror(-ret)); - return; + error_setg_errno(&err, -ret, "failed to inject error"); + goto out; } =20 + monitor_printf(mon, "OK id: %s root bus: %s, bus: %x devfn: %x.%x\n", id, pci_root_bus_path(dev), pci_dev_bus_num(dev), PCI_SLOT(dev->devfn), PCI_FUNC(dev->devfn)); + +out: + hmp_handle_error(mon, err); } --=20 2.37.3 From nobody Tue May 7 14:32:24 2024 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=1669896958; cv=none; d=zohomail.com; s=zohoarc; b=bVypU95AK8eihLlcke4z+6kNFUyWiKUPIiz+khx3KIH+yyMFrhD/jdX0TF5l7gchE+RqDO8WqU5jqKF7/2tLLSW8eb5MKXurXg3Zg1NgCTA4wWzOmPbgL3LAlijqLJmri0XZAWtfoh3RBhnbj122gy2aEu1l95lonclhRKXoKfQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1669896958; 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=tMuPo184aR/4lwa6QLLu9EahT8n7bDM18SU1zwC9j58=; b=eKY/36LBXFgxTlvAO1dtx3nwcu6KK+YIcKYnCOa470QmFDk6XqIBaGwnos5Dj6RnKrg4nfvv0kFE9Cl9fJdNxFlP+oDxDOvLlTnbHhYBsreyHuLiPqUJ5I1hScBWe0G+TUsv/6sbhTpExwRWJwvyQVDJroQbuW1fcoIYRNaXjpk= 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 1669896958446800.8296488609691; Thu, 1 Dec 2022 04:15:58 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p0iPz-0004MZ-Q2; Thu, 01 Dec 2022 07:11:55 -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 1p0iPu-0004H3-3I for qemu-devel@nongnu.org; Thu, 01 Dec 2022 07:11:50 -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 1p0iPp-0008FM-4t for qemu-devel@nongnu.org; Thu, 01 Dec 2022 07:11:49 -0500 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-614-YBJ9Ip5aP3uIdM01d5JEsQ-1; Thu, 01 Dec 2022 07:11:41 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0F79329A8AA2; Thu, 1 Dec 2022 12:11:41 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DAA824022C0; Thu, 1 Dec 2022 12:11:40 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 07EA721E65CF; Thu, 1 Dec 2022 13:11:34 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669896704; 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=tMuPo184aR/4lwa6QLLu9EahT8n7bDM18SU1zwC9j58=; b=Npra/TbFvODY3kDBaUlUhSUglaiJZTx5waapIaZN+kP2+CneSqgVly2s0CGLidFt8BwqpA r2Px0DI8ue00CDtg6qQXHH/PiAV7vxcYLVBk4iwFWzGaGpxpEPpTBvMi+pKBxp53GAPbM1 WGGclghvxeBF5LSyCnbdO3qb4HFEjVc= X-MC-Unique: YBJ9Ip5aP3uIdM01d5JEsQ-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: mst@redhat.com, marcel.apfelbaum@gmail.com, dgilbert@redhat.com, philmd@linaro.org Subject: [PATCH v2 13/13] pci: Reject pcie_aer_inject_error -c with symbolic error status Date: Thu, 1 Dec 2022 13:11:33 +0100 Message-Id: <20221201121133.3813857-14-armbru@redhat.com> In-Reply-To: <20221201121133.3813857-1-armbru@redhat.com> References: <20221201121133.3813857-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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: 1669896959571100001 Content-Type: text/plain; charset="utf-8" When argument @error_status is symbolic, flag -c is ignored. Reject it instead. Signed-off-by: Markus Armbruster --- hw/pci/pci-hmp-cmds.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hw/pci/pci-hmp-cmds.c b/hw/pci/pci-hmp-cmds.c index 7a3175ab4b..043b0a601d 100644 --- a/hw/pci/pci-hmp-cmds.c +++ b/hw/pci/pci-hmp-cmds.c @@ -189,6 +189,11 @@ void hmp_pcie_aer_inject_error(Monitor *mon, const QDi= ct *qdict) } error_status =3D num; correctable =3D qdict_get_try_bool(qdict, "correctable", false); + } else { + if (qdict_haskey(qdict, "correctable")) { + error_setg(&err, "-c is only valid with numeric error status"); + goto out; + } } aer_err.status =3D error_status; aer_err.source_id =3D pci_requester_id(dev); --=20 2.37.3