From nobody Sun May 5 12:09:51 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=1669622594; cv=none; d=zohomail.com; s=zohoarc; b=DrgehQvQScAekDp7Kdf//ksVh+FWtYt2FAe5a/E/gfPk/7niJEfcaa6+WqJY3i6kbsnIL1mbW3wmezljTHEeikczZr+mYDK1FEAErrwv+nuRgDvw7fZUcyj6xiYlIH5gT1lgDKHH4zSQX7t6dcUAzFiHJiiMVw0+hkCRV214Sd4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1669622594; 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=SKFNjZsodmuCWvk1fxQUMjoGF2cK4rVcvkp/XTxjMZc=; b=J3fsrsJxqUaolddxpirbQTjz6YRn6aZ/7Sef/v753v/SzOdk3U7emIfyLqSx0KNoKmtz0doOxj75CNJrEUEpYy42dE5jKqgRUDc/6bdpuNxSwzx+z5aY/DVP6y6D7Quo5WVqbKVToy1sIv+fkZDVh9f5izNLtNabJzx1cE3hTCk= 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 1669622594080176.9181197530679; Mon, 28 Nov 2022 00:03:14 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ozZ5l-0005HR-JX; Mon, 28 Nov 2022 03:02:17 -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 1ozZ5e-0005GR-Je for qemu-devel@nongnu.org; Mon, 28 Nov 2022 03:02:11 -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 1ozZ5c-0008HR-VX for qemu-devel@nongnu.org; Mon, 28 Nov 2022 03:02:10 -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-13-NxbsHKvBMMKga2ELwa1RiA-1; Mon, 28 Nov 2022 03:02:06 -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 0F9A4185A7AC; Mon, 28 Nov 2022 08:02:06 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D09624B400F; Mon, 28 Nov 2022 08:02:05 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 8AD7F21E6930; Mon, 28 Nov 2022 09:02:02 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669622528; 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=SKFNjZsodmuCWvk1fxQUMjoGF2cK4rVcvkp/XTxjMZc=; b=BeWfDsbB9nMu3y3VIWS4r9HQg5dqYmPKfUMR2PSG4whsXQ5E8no8mYQ6DuCoQq6w/IQLvI t1TWLNbkxJ2x9v1UkwXKpNe2zUyJQWKPx20oQH/mrGoPvrga3LcMT7APwNqkLohfwio1La uNdFv12IDEa0Q8dAmlswzfvtiknWCGU= X-MC-Unique: NxbsHKvBMMKga2ELwa1RiA-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: mst@redhat.com, marcel.apfelbaum@gmail.com, dgilbert@redhat.com Subject: [PATCH 01/12] pci: Clean up a few things checkpatch.pl would flag later on Date: Mon, 28 Nov 2022 09:01:51 +0100 Message-Id: <20221128080202.2570543-2-armbru@redhat.com> In-Reply-To: <20221128080202.2570543-1-armbru@redhat.com> References: <20221128080202.2570543-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.129.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: 1669622596823100002 Content-Type: text/plain; charset="utf-8" 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 Sun May 5 12:09:51 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=1669623228; cv=none; d=zohomail.com; s=zohoarc; b=EBTffQm7QFUTusYzWAHOdk6/eusT6Qnwmx2Cgo/yTKuOp2EkX8Z0n34WuHodmcMgsZdF32azA2EfMHKwQ+cxIwGvaP/ei9/8OEYa4C1yzutmTE7WDDgvciEm03WhmFnY/PwfsOQezDAJQWaW2NvQCRyYY+czDdTsiS4ArJ5YzQw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1669623228; 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=PUKc1xYzdtx/vn9EdYCV6wGVbFdAiCJ+Q+dJwQEoCfg=; b=NzFyBSRgycN+ua4Z1eUQUVR0C+stDS5TdNrc4RgNnzDLT7Kfowo9bFs+yXJi90C4P4UGGLRC0DBhfRCphrFB0IxbsGZWuH5Ia/HReuwFBHAy36vS3w+lJv0aNtgoVHMgQzuf3pZ4dYJdyd7iM+Kq/e6qa8Y45rOH+rcr78yXxgM= 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 166962322892657.16470610484566; Mon, 28 Nov 2022 00:13:48 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ozZ5s-0005MF-0i; Mon, 28 Nov 2022 03:02:24 -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 1ozZ5h-0005H3-Gm for qemu-devel@nongnu.org; Mon, 28 Nov 2022 03:02:13 -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 1ozZ5f-0008Hv-0p for qemu-devel@nongnu.org; Mon, 28 Nov 2022 03:02:13 -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-27-FDFWMZf-PVCgGfcgrGUYDQ-1; Mon, 28 Nov 2022 03:02:06 -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 58925833A06; Mon, 28 Nov 2022 08:02:06 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D17312166B2B; Mon, 28 Nov 2022 08:02:05 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 8D19421E6936; Mon, 28 Nov 2022 09:02:02 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669622530; 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=PUKc1xYzdtx/vn9EdYCV6wGVbFdAiCJ+Q+dJwQEoCfg=; b=SlvlS33IMz0wTiEWCCRUxm1OcKEum4wFKi9EKd1N9+vo5g9L2kZakPObNUKHbkLQOQ3J2/ /Kub4sPeTT6HXShmPo/9u8/Y05gdHAFywytfl18ABDKBVNuVbr97mWxhdg4r036CE0J7Et V6tI9tjGGgW+KJmtoaEpsmLKuFYcY5M= X-MC-Unique: FDFWMZf-PVCgGfcgrGUYDQ-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: mst@redhat.com, marcel.apfelbaum@gmail.com, dgilbert@redhat.com Subject: [PATCH 02/12] pci: Move QMP commands to new hw/pci/pci-qmp-cmds.c Date: Mon, 28 Nov 2022 09:01:52 +0100 Message-Id: <20221128080202.2570543-3-armbru@redhat.com> In-Reply-To: <20221128080202.2570543-1-armbru@redhat.com> References: <20221128080202.2570543-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: -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: 1669623230867100007 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 Sun May 5 12:09:51 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=1669622707; cv=none; d=zohomail.com; s=zohoarc; b=Nb/sDphwoci9Yc5I9WFBvAWEzANzN/BxZ7q23cO3BCAXGxDtlZQhGvpFUyU9tfvnuJiT0Rnclx3Fzrf7+ELFsTrSrF4EAsoH3Rohu0J2KeT2LGIAAmMcJKLvXxL+xn4yOHnhGFMcyhzO0nT0GoTFSc9ReQcVt8asxBKhhpWBhrc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1669622707; 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=4AjgnZa0Q0JCVnnI/oAWbca+tv4RtT19S4mYiQWCdFo=; b=knVyI6lXcFD+xeIm31FmGXKqrV3Ejpbp+F4C3BnFrcz/xA5IJgv/QXbt7o3PUP7vLkZafRyDcO6k7/tvUtbtYdp7Xl5dDUe0aG3UMBQHGV96e/w2tt8vbmGCrL+ZoUXeHvV3vg6TrLUgY0kcXY885wT+qRcireMAtZhYGytWQpM= 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 1669622707141400.14013053617487; Mon, 28 Nov 2022 00:05:07 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ozZ5p-0005JU-5i; Mon, 28 Nov 2022 03:02:21 -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 1ozZ5i-0005H6-0l for qemu-devel@nongnu.org; Mon, 28 Nov 2022 03:02:14 -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 1ozZ5f-0008Hu-BK for qemu-devel@nongnu.org; Mon, 28 Nov 2022 03:02:13 -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-34-QdJ0H0LNOr616FhxAE5ZkQ-1; Mon, 28 Nov 2022 03:02:06 -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 356F23811F28; Mon, 28 Nov 2022 08:02:06 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D1B472166B2E; Mon, 28 Nov 2022 08:02:05 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 8F8AD21E688F; Mon, 28 Nov 2022 09:02:02 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669622530; 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=4AjgnZa0Q0JCVnnI/oAWbca+tv4RtT19S4mYiQWCdFo=; b=bUrjJpFXgCk13OckEkfflfxgECGZgHbR2AS1Y4zI+qTyEkPo3tf8tywJryc+tFB4d28cOk pvoA6AFXlk8uaE1MgMd1VKT7qUNiXNHJZC8hF2Vuopum2y5dmg+pKV1xMiqLlLXUjoDzHd DHY8MHO+Z09x9IFXs4k6rAFhbsCQyjs= X-MC-Unique: QdJ0H0LNOr616FhxAE5ZkQ-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: mst@redhat.com, marcel.apfelbaum@gmail.com, dgilbert@redhat.com Subject: [PATCH 03/12] pci: Move HMP commands from monitor/ to new hw/pci/pci-hmp-cmds.c Date: Mon, 28 Nov 2022 09:01:53 +0100 Message-Id: <20221128080202.2570543-4-armbru@redhat.com> In-Reply-To: <20221128080202.2570543-1-armbru@redhat.com> References: <20221128080202.2570543-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.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: 1669622708696100003 Content-Type: text/plain; charset="utf-8" This moves these commands from MAINTAINERS section "Human Monitor (HMP)" to "PCI". Signed-off-by: Markus Armbruster Reviewed-by: Dr. David Alan Gilbert Reviewed-by: Michael S. Tsirkin Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- 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 Sun May 5 12:09:51 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=1669622714; cv=none; d=zohomail.com; s=zohoarc; b=TWJilb+/+bj4zQUlS2z2LeCyYlIUbfSnwttLYNTUEQgsohPRTo+P4rGrNDkYPZPdAsZ7FBXjjiJ1XLskJLjaFIjsAE5sMeP3EC+6/U1+1O4XxPOKUY65kRJKznMZqty3aJ+/noXEU796rPi/VKY2HmhRDywlpnl2CfW+O1X6M8U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1669622714; 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=YgYs1qU4yTrNRzouHSKOYoIxSlMdJ0BzCp6t+kQVroM=; b=YTPXJQv/AQ5b7RAAQdGRDzDXCsrMW+Ipk0JTnq5FOb/lTeo72D0w9s8GsPEPRjilaAFG8aRoMmU8H5q2gVHkVIRF3BPmu6zayJYKz64Y+RQ9JcYluf5fINQzJ2wS90o8jNYl4cs3FC7nRcljjnI0ErekTq2991Bg219Snu/ENwE= 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 1669622714305637.8930807511164; Mon, 28 Nov 2022 00:05:14 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ozZ5r-0005M6-Rg; Mon, 28 Nov 2022 03:02:23 -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 1ozZ5e-0005GQ-AU for qemu-devel@nongnu.org; Mon, 28 Nov 2022 03:02:11 -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 1ozZ5c-0008HU-Q7 for qemu-devel@nongnu.org; Mon, 28 Nov 2022 03:02:10 -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-638-mBRgwuuvONCPAcAdcRP9Vg-1; Mon, 28 Nov 2022 03:02:06 -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 132E1800B23; Mon, 28 Nov 2022 08:02:06 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D0B21112131E; Mon, 28 Nov 2022 08:02:05 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 91C4321E66EF; Mon, 28 Nov 2022 09:02:02 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669622528; 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=YgYs1qU4yTrNRzouHSKOYoIxSlMdJ0BzCp6t+kQVroM=; b=b1fF+AyxWSGLLiydMcOFTEO6RLmxHZQB+p1TGtw6c5l7mIkPyWOOZP225e9KtYu6p5Li7Z pmg0G7tcOdfZ5SPrzNzQQra2jC4WKsNCpTrGf1YcHdHLTLpvbE3UmHPJD8y0X/Z7LiDOh0 kt1zDaSs2BMcKDha0SCEZR0N5zEEvCQ= X-MC-Unique: mBRgwuuvONCPAcAdcRP9Vg-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: mst@redhat.com, marcel.apfelbaum@gmail.com, dgilbert@redhat.com Subject: [PATCH 04/12] pci: Make query-pci stub consistent with the real one Date: Mon, 28 Nov 2022 09:01:54 +0100 Message-Id: <20221128080202.2570543-5-armbru@redhat.com> In-Reply-To: <20221128080202.2570543-1-armbru@redhat.com> References: <20221128080202.2570543-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: 1669622714762100005 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: Dr. David Alan Gilbert Reviewed-by: Michael S. Tsirkin --- 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 Sun May 5 12:09:51 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=1669622592; cv=none; d=zohomail.com; s=zohoarc; b=jtHQzmVn3I3URlOVcxEm1LCOmYc/0WudFLtStOUBOi8Mg0gt/SIvbOFHyXffX9C9A6VHtvtJ5M4svbsfxRT8pd758jdMz9KIfhxVsz3JB+pmAVeoBgejpzqRafV7CsB2qOZv7dr8UWCIdUpiwFH94wiGxg57d+1rPqGBjCsXwfA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1669622592; 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=z/Uz/XSTeADpf42yZRXp3UQCHZJPl5nfbuXE5y94RMA=; b=URCoOiwftNHT140j71DjAucvko/viotZVFxJJGk7mo2lB6mZSWCW8l8Yoxv8jc9y8Iio0FSbkY6JiWZAOb6OCp3XYgXkpPmDnjX67fuQju4GAAbwfogHvlik+1FHnaEsrwfBqTahhctkLWRkXCzM/DjsaPwOkz0mQwiD69JVSuQ= 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 1669622592977932.7894794249843; Mon, 28 Nov 2022 00:03:12 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ozZ5y-0005OW-BP; Mon, 28 Nov 2022 03:02:30 -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 1ozZ5w-0005O2-9d for qemu-devel@nongnu.org; Mon, 28 Nov 2022 03:02:28 -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 1ozZ5u-0008NH-RJ for qemu-devel@nongnu.org; Mon, 28 Nov 2022 03:02:28 -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-26-o5Hz4pNXOESL-oKPgRMctQ-1; Mon, 28 Nov 2022 03:02:22 -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 6603C29AB41B; Mon, 28 Nov 2022 08:02:22 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5201C40C6EC2; Mon, 28 Nov 2022 08:02:09 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 940BE21E65C5; Mon, 28 Nov 2022 09:02:02 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669622546; 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=z/Uz/XSTeADpf42yZRXp3UQCHZJPl5nfbuXE5y94RMA=; b=F3P0nc/zJpkogFnAaznFSXJioNcEoXfDEO+SI5kxHokvaq9eCoYTqAHEknO3N7kaFv1OWh bVZYKTfEyrsqm8wWU2IoZg3gwAmZDg19p8NpUkMAQTPsNr2xGTU/93FmUtzmQEH3S7bDsC WKocP7WXOZujpZWtCJvjp48oakAUCS4= X-MC-Unique: o5Hz4pNXOESL-oKPgRMctQ-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: mst@redhat.com, marcel.apfelbaum@gmail.com, dgilbert@redhat.com Subject: [PATCH 05/12] pci: Build hw/pci/pci-hmp-cmds.c only when CONFIG_PCI Date: Mon, 28 Nov 2022 09:01:55 +0100 Message-Id: <20221128080202.2570543-6-armbru@redhat.com> In-Reply-To: <20221128080202.2570543-1-armbru@redhat.com> References: <20221128080202.2570543-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: 1669622597847100007 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 Sun May 5 12:09:51 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=1669622686; cv=none; d=zohomail.com; s=zohoarc; b=My2+lCBsQlHGzVSzOZQ29CcNtgExz1UkiYkWO2Dehtb9ZxGOCB8W9U7iYLjY5fh1zrH4XK90TH7+PG/LSnhGAin/2JBxDAgEwvk/OuQGY8BdBVkPqa9am6EhJqBUfAxidtu5Q/keaxOrAbIP9YGwqxnkn3VoEmtnpX0Oh6OHUsc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1669622686; 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=uoMkM51YXOHRxxs/Q58nlVDBV1L5s3ub5jjAv2hYOQc=; b=aKTcWjMnjf+iC4T1BJAUJbj7G4YZgo52Se1u4mwM3zK0USpvGZQnXWVe3Tr7BqmSneAf5uHeeVKab6edjGNP+kDb92b2Ngm8g0aSkFMAncdPePX2u/DSOwB+e8NC7P0QHqZMZMvQ8dchVc7bZYfGz1z1cxM+UtzHhddO02yfu4o= 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 1669622686029830.5719681438451; Mon, 28 Nov 2022 00:04:46 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ozZ5t-0005NB-KL; Mon, 28 Nov 2022 03:02:25 -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 1ozZ5p-0005JJ-5f for qemu-devel@nongnu.org; Mon, 28 Nov 2022 03:02:21 -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 1ozZ5g-0008IF-Fw for qemu-devel@nongnu.org; Mon, 28 Nov 2022 03:02:20 -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-574-k2WnzBexPAOpySRXiOqjjg-1; Mon, 28 Nov 2022 03:02:10 -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 7BB281C0515A; Mon, 28 Nov 2022 08:02:09 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 51E764B400F; Mon, 28 Nov 2022 08:02:09 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 964FB21E65C6; Mon, 28 Nov 2022 09:02:02 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669622532; 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=uoMkM51YXOHRxxs/Q58nlVDBV1L5s3ub5jjAv2hYOQc=; b=K1TeDf4jMfeEFuaVo9QQd6y5jPHWJMA/rbMV9ZzB1cDXLXaXWe2axH7iDXAqykuvAKne66 DCNmdgjjJo+AV8G2bWi/QQGzjTo1oCouBVQdiG8zhzyBjovHsRmeRQP3lDORuFRq70Qw9r T3qXoQKMbkgX1QlU8Y1o9sWFhgL2BYM= X-MC-Unique: k2WnzBexPAOpySRXiOqjjg-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: mst@redhat.com, marcel.apfelbaum@gmail.com, dgilbert@redhat.com Subject: [PATCH 06/12] pci: Deduplicate get_class_desc() Date: Mon, 28 Nov 2022 09:01:56 +0100 Message-Id: <20221128080202.2570543-7-armbru@redhat.com> In-Reply-To: <20221128080202.2570543-1-armbru@redhat.com> References: <20221128080202.2570543-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: 1669622686582100001 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 Sun May 5 12:09:51 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=1669622713; cv=none; d=zohomail.com; s=zohoarc; b=XXnNX6VX9li8wUST5S67lqcGDLCv3bC+tVNWQ83NPyRRDZeuxjPEkvwks6ZWQeamXOfPPR/msWqMNwMhRlvtCkDC2JNGuMVHtZVEvDsgRuCsu/vrMf8g1MiEhfC9u5J07oJ4yAj1ZZ6Bw+yrp+omeibcHQr5yHvpe4r0d8ZJ2Z0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1669622713; 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=WyvQ0nDjaGBZg2DIeUAVKAfcN9u7tkva9LSKYpXsQ1A=; b=fOnUWEpcJ4MRvE/plDRVyrb2Et7Z7FzEX1PKvs4/DbeTYBm+TWHZcjR00EUuaBpKuUfZqRyRCCIBVCo1b4iPCrUGndsIMskZRJCae7cif29uk/9mNTeYYihYwLNbqQD9RmpKoVmGSwuAxkp9kDGXN5lirxzF1CVWGjWgxJsp8SA= 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 166962271302377.43292727982532; Mon, 28 Nov 2022 00:05:13 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ozZ5q-0005Kl-SH; Mon, 28 Nov 2022 03:02:22 -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 1ozZ5k-0005HV-7S for qemu-devel@nongnu.org; Mon, 28 Nov 2022 03:02:17 -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 1ozZ5i-0008Iq-IY for qemu-devel@nongnu.org; Mon, 28 Nov 2022 03:02:15 -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-287-SmDTgUjsMf-FBCQ2KtQSaA-1; Mon, 28 Nov 2022 03:02:10 -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 9D656811E7A; Mon, 28 Nov 2022 08:02:09 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5182735429; Mon, 28 Nov 2022 08:02:09 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 98AD321E65C7; Mon, 28 Nov 2022 09:02:02 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669622533; 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=WyvQ0nDjaGBZg2DIeUAVKAfcN9u7tkva9LSKYpXsQ1A=; b=g4q8RkDEN8yFPtiTCSxmNc2wEiMD1SaE4+Brrio3E91VdX1YCu0RiMTHhW+NaN1ekrMhyi bzuZrLfcfX8eL07u9U1ink9U2srlp+3N1JaMn5xLzjpFGOLdRSfBopBU1weIOGBIu9maoA gr5/s6kd2sBTUQEk+S8xDX855KK/m2Q= X-MC-Unique: SmDTgUjsMf-FBCQ2KtQSaA-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: mst@redhat.com, marcel.apfelbaum@gmail.com, dgilbert@redhat.com Subject: [PATCH 07/12] pci: Move pcibus_dev_print() to pci-hmp-cmds.c Date: Mon, 28 Nov 2022 09:01:57 +0100 Message-Id: <20221128080202.2570543-8-armbru@redhat.com> In-Reply-To: <20221128080202.2570543-1-armbru@redhat.com> References: <20221128080202.2570543-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: -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: 1669622714699100003 Content-Type: text/plain; charset="utf-8" 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 Sun May 5 12:09:51 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=1669622657; cv=none; d=zohomail.com; s=zohoarc; b=jBMECr+Fp46w9gcG0aZrSrZOMEadPXKgf169OSJBK9FdRbglsaF+/RBnfKpM/6UsIBv9gaskKsP5xq6A2cafMIAAQ5NhzbUBgHQSgYTozGWLhLmty5Djf3dn+OvxgRjMkTdSnR9jknUWvSIW3yc2Q49lixgi071Ed8Wg/bLOqPs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1669622657; 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=NiV381FEMUW8USBkyYlMbdFlQZtTMO8VF3FTuVpmWuw=; b=WjT9fzCj5Wl3znfeiY/s6CQVRfvQ9yiwTrx+3RS/oAGknaZtfY6P/cFsvG5KTmupwR34CCAFd7adOV0+7nJTADwNg9FJ4kptM/+lzoqohTyHXLgKit8G5FKiD5G9GJ88XAFg1DFAIRUEm/bj67Yl5peff22cbpHzgpq5WpqBWQU= 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 1669622657104295.68990723046693; Mon, 28 Nov 2022 00:04:17 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ozZ5r-0005Lf-9f; Mon, 28 Nov 2022 03:02:23 -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 1ozZ5i-0005HK-OY for qemu-devel@nongnu.org; Mon, 28 Nov 2022 03:02:15 -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 1ozZ5g-0008IA-AY for qemu-devel@nongnu.org; Mon, 28 Nov 2022 03:02:14 -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-277-UK-DP4DAOMeQ1w6_YSaRGg-1; Mon, 28 Nov 2022 03:02:10 -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 79794185A79C; Mon, 28 Nov 2022 08:02:09 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 51EBF2166B2B; Mon, 28 Nov 2022 08:02:09 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 9B19421E65C8; Mon, 28 Nov 2022 09:02:02 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669622531; 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=NiV381FEMUW8USBkyYlMbdFlQZtTMO8VF3FTuVpmWuw=; b=bwDRt8daqGog6fxiW817D7Ad3mzL66pJgW7Y7ZpWcDN8+5heifKQa3H4jjfB43pKCirAur a2982bj+jM62/sSgqPgp4SsRfPz0f6F79Wq7++z6rLl0rrTRnOqsKXIF2Qh1XcdkJitG1G 2rtjb086vrJu3/pERAqtV+qKeW1blnA= X-MC-Unique: UK-DP4DAOMeQ1w6_YSaRGg-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: mst@redhat.com, marcel.apfelbaum@gmail.com, dgilbert@redhat.com Subject: [PATCH 08/12] pci: Fix silent truncation of pcie_aer_inject_error argument Date: Mon, 28 Nov 2022 09:01:58 +0100 Message-Id: <20221128080202.2570543-9-armbru@redhat.com> In-Reply-To: <20221128080202.2570543-1-armbru@redhat.com> References: <20221128080202.2570543-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: -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: 1669622658466100003 Content-Type: text/plain; charset="utf-8" PCI AER error status is 32 bit. When the HMP command's second argument parses as a number, values greater than ULONG_MAX get rejected, but values between UINT32_MAX+1 and ULONG_MAX get silently truncated. Fix to reject them, too. While there, use qemu_strtoul() instead of strtoul() so checkpatch.pl won't complain. Signed-off-by: Markus Armbruster Reviewed-by: Michael S. Tsirkin --- hw/pci/pcie_aer.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/hw/pci/pcie_aer.c b/hw/pci/pcie_aer.c index eff62f3945..ccca5a81cc 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 long num; bool correctable; PCIDevice *dev; PCIEAERErr err; @@ -983,14 +985,14 @@ 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_strtoul(error_name, NULL, 0, &num) < 0 + || num > UINT32_MAX) { 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 Sun May 5 12:09:51 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=1669622627; cv=none; d=zohomail.com; s=zohoarc; b=jHhqwX6dAZ8nv3wIZo4slzIoYZZ2STtVQpkOrmRQxM1Qe3oCeYT/TC9L4iW5ZgCxubM82fyMpU9w3oAwoUQa2F+5tLDlhdcw98dsOG9HlJDf+j08jrOnGfG/ZW5gFl68V4Uim+pr/5ncgU8KrXS8BcuRxUJpyYZa0kAUuViF284= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1669622627; 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=drEcGDJTiF0kzfalrxuMoQe8W7Rl5drRQBHs57xXr/g=; b=cKX8MUKt1UYeC8TYVShlxnFUSMNKleVY1J1yBbNUbngj58RtO844Ky8x5aeoYTwOSb48Q6WkmuFBf7Pe0woeCbsAnLIuy46GjdfrWVAsmtecup7T38jfqTObdqQG2VznXAW0wwQrvb4Leubn7PReduOaNmjg4cPFvTOgil8YYco= 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 1669622627887429.55789750723875; Mon, 28 Nov 2022 00:03:47 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ozZ5t-0005Mp-2r; Mon, 28 Nov 2022 03:02:25 -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 1ozZ5r-0005Lg-6g for qemu-devel@nongnu.org; Mon, 28 Nov 2022 03:02:23 -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 1ozZ5p-0008L1-3m for qemu-devel@nongnu.org; Mon, 28 Nov 2022 03:02:22 -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-519-wkUna6_7Pe2-WmXshHJBQw-1; Mon, 28 Nov 2022 03:02:15 -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 DF903101A528; Mon, 28 Nov 2022 08:02:14 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 521EA4B4011; Mon, 28 Nov 2022 08:02:09 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 9D61E21E65C9; Mon, 28 Nov 2022 09:02:02 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669622540; 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=drEcGDJTiF0kzfalrxuMoQe8W7Rl5drRQBHs57xXr/g=; b=G7MlZNLtVpMl8URPto/y0BX7BNWQ14rRtCegz8zLXfmcW1MWPXH7vpVRMktd2Y9RynQUTO YhZU8kZyhIFenbrvckgvaFNjmxw0VP88N8grcKmCWvSHw44iT86+tldbcbCAVfs72NQLad 8h2ik/tKngFuZdgWutBVsRq541guVMQ= X-MC-Unique: wkUna6_7Pe2-WmXshHJBQw-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: mst@redhat.com, marcel.apfelbaum@gmail.com, dgilbert@redhat.com Subject: [PATCH 09/12] pci: Move HMP command from hw/pci/pcie_aer.c to pci-hmp-cmds.c Date: Mon, 28 Nov 2022 09:01:59 +0100 Message-Id: <20221128080202.2570543-10-armbru@redhat.com> In-Reply-To: <20221128080202.2570543-1-armbru@redhat.com> References: <20221128080202.2570543-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.129.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: 1669622628370100001 Content-Type: text/plain; charset="utf-8" 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 | 105 ++++++++++++++++++++++++++++++++++++ hw/pci/pci-stub.c | 1 - hw/pci/pcie_aer.c | 115 ++-------------------------------------- 6 files changed, 114 insertions(+), 115 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..393ab4214a 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,106 @@ 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 long 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_strtoul(error_name, NULL, 0, &num) < 0 + || num > UINT32_MAX) { + 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 ccca5a81cc..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,99 +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 long 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_strtoul(error_name, NULL, 0, &num) < 0 - || num > UINT32_MAX) { - 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 Sun May 5 12:09:51 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=1669622647; cv=none; d=zohomail.com; s=zohoarc; b=WEeT1XGe4hBOuw5ythdnlN2txbLMVEefhm6SUudZ5ZpjFv1dHkjzWfRc1ZL8t43rBLwCY3l9+e9yrNdRkRLjj+z8jRUIjHl559b4OHYzpCCCmjWnsMEWdDaRx5sCDdmpQ5J8nUn8ddfT6CXAbJH+jwx/fPEmMQiVB+L3zib9C90= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1669622647; 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=PgL03zRpmG1WDtKgQ0TG4BQETSEz+ediqlqFAY3t3pE=; b=Plt36Yq7Fvmr+m9i+FRvtzi4fGiZkykkNOBuIVUHs82Jh+BDF1ZkQLB0NQp0X+gxKHq0SfKZge+1SBI9UPB/Q553hzai+aKow9tGud5QwXQTWoMwKUJDEj5eXOGIy5WeeZhwuN4d7dHdwQ0HUjAK6rwjyRXino34Jz1SnsZXpN8= 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 1669622647858821.4668755974614; Mon, 28 Nov 2022 00:04:07 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ozZ5q-0005Jt-41; Mon, 28 Nov 2022 03:02:22 -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 1ozZ5i-0005HM-RV for qemu-devel@nongnu.org; Mon, 28 Nov 2022 03:02:15 -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 1ozZ5g-0008I8-5Y for qemu-devel@nongnu.org; Mon, 28 Nov 2022 03:02:14 -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-147-Kxgbu6KjNbOtdoLC64Lc0w-1; Mon, 28 Nov 2022 03:02:10 -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 7F4D13C3C161; Mon, 28 Nov 2022 08:02:09 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 51BB54EA54; Mon, 28 Nov 2022 08:02:09 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 9F9A721E65CA; Mon, 28 Nov 2022 09:02:02 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669622531; 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=PgL03zRpmG1WDtKgQ0TG4BQETSEz+ediqlqFAY3t3pE=; b=R2iAuohLKCmki8c1nseAjwirHWdc4V58yXGwXj3s1iTcDdGrSscjik6iNNwf8CSOZYKicp 6fsFY3FnB5S1SV5Q51jYZ/oQRp67HVOBMQQpdl+fRPI+cB2n5pvasKfzJsjNidzeQRN1pp PC3u7o1cy8O0zpXc7HIBMl0O0t/AH6k= X-MC-Unique: Kxgbu6KjNbOtdoLC64Lc0w-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: mst@redhat.com, marcel.apfelbaum@gmail.com, dgilbert@redhat.com Subject: [PATCH 10/12] pci: Inline do_pcie_aer_inject_error() into its only caller Date: Mon, 28 Nov 2022 09:02:00 +0100 Message-Id: <20221128080202.2570543-11-armbru@redhat.com> In-Reply-To: <20221128080202.2570543-1-armbru@redhat.com> References: <20221128080202.2570543-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: -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: 1669622648409100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Markus Armbruster Reviewed-by: Dr. David Alan Gilbert Reviewed-by: Michael S. Tsirkin --- 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 393ab4214a..b03badb1e6 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"); @@ -203,7 +189,7 @@ static int do_pcie_aer_inject_error(Monitor *mon, || num > UINT32_MAX) { 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); @@ -239,25 +225,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 Sun May 5 12:09:51 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=1669622798; cv=none; d=zohomail.com; s=zohoarc; b=IP+imrkM1sVWl0gn1miuenwZPsetuKzmv4QmpUPNQ5e8mAPDzvE/IpG0VKLBAkIEerwpQruoIjPFyEVFC9IUf6Y2QvVAVlV4kz3prawguGP0qw3SfW3kpNYq295xO4tzKu09Z8DzU9UPvoGjH5gmM5vI/0nDX23TLJGGHuXASFY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1669622798; 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=W0g3mdWQWgww8n+FGFHWIsjNHNcqysuQT+Exj9YJ4EA=; b=NNkK0XCfqMUdnByNo3NH5kk9Nh23elIb9visvX4yAHrbgzoO0zsXrZSa4fRldgwuxLf/HOb3s01F4VU7NeD/PfnfA1m09qyxW+v9/byYRNXE4DKsvRu/LxJ5TnpH0ffkpjXtXWI38hV4UwLjkHotKflzdnT9IOsM+xiVtI+TFB8= 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 1669622798387673.2345527944901; Mon, 28 Nov 2022 00:06:38 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ozZ5p-0005Jj-E1; Mon, 28 Nov 2022 03:02:21 -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 1ozZ5j-0005HU-U5 for qemu-devel@nongnu.org; Mon, 28 Nov 2022 03:02:17 -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 1ozZ5h-0008IQ-9m for qemu-devel@nongnu.org; Mon, 28 Nov 2022 03:02:15 -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-616-G0IdT9VEPTawsfc9b3KS4w-1; Mon, 28 Nov 2022 03:02:10 -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 7BB0F3C3C162; Mon, 28 Nov 2022 08:02:09 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 522B54B4013; Mon, 28 Nov 2022 08:02:09 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id A1F7821E65CB; Mon, 28 Nov 2022 09:02:02 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669622532; 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=W0g3mdWQWgww8n+FGFHWIsjNHNcqysuQT+Exj9YJ4EA=; b=eNFHVJdR1a/XngUmMh09yNGFd61lIE2Ho9xGgVAUOGw+GKopJZj/F4rytysmsBMYj31w9A uowwDB1cZbunGWLN5qnoAMC1G5U8tvP15eNWwMY8WQZFtHkhYb+nsWzh8OswJ9L4xCSScV T6UZfAeX4pljKPuscFPAK5DpjbmEJgk= X-MC-Unique: G0IdT9VEPTawsfc9b3KS4w-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: mst@redhat.com, marcel.apfelbaum@gmail.com, dgilbert@redhat.com Subject: [PATCH 11/12] pci: Rename hmp_pcie_aer_inject_error()'s local variable @err Date: Mon, 28 Nov 2022 09:02:01 +0100 Message-Id: <20221128080202.2570543-12-armbru@redhat.com> In-Reply-To: <20221128080202.2570543-1-armbru@redhat.com> References: <20221128080202.2570543-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: 1669622799529100001 Content-Type: text/plain; charset="utf-8" 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 b03badb1e6..0807a206e4 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 long num; bool correctable; PCIDevice *dev; - PCIEAERErr err; + PCIEAERErr aer_err; int ret; =20 ret =3D pci_qdev_find_device(id, &dev); @@ -194,34 +194,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 Sun May 5 12:09:51 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=1669622990; cv=none; d=zohomail.com; s=zohoarc; b=Cw4EnXrDRfT4lebwsJfqB19p6dxoiVTcaueCu58ayMTqt0H6DgosZYJ8axeDBwMmt4DlZwc7TfHUmq9FfY/cmgmRJCZCpS2yz2dZcYceEDMEUqt/AllWxO2CWIbk9BRKHCfFtNxhnMn45jiSbA5uqEcH4vHMFgtSw8ulRtd03Jc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1669622990; 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=dEU6Ae8sIPzKwWpjXuPcCz2lmSWx7oC4hlItFz0kK1w=; b=aeGKxVZPxBZ6BtyDUm3LqrKYemxhdjIKxx7DptPfH3AyKJFyT8fZbV9fTHojmWxAwmLiT/OeV/8YQ4gWSSsQBgLHCNFNc9qBPlaDHh0L44/e2Y7C1yl1NaneThlHpommeIuLnEA1w+EVbozxZLLrAMYKnV4efrR2b5DJXmfHK1I= 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 1669622990210553.2284451546767; Mon, 28 Nov 2022 00:09:50 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ozZ5q-0005K0-DL; Mon, 28 Nov 2022 03:02:22 -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 1ozZ5j-0005HT-QK for qemu-devel@nongnu.org; Mon, 28 Nov 2022 03:02:17 -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 1ozZ5i-0008Ig-8m for qemu-devel@nongnu.org; Mon, 28 Nov 2022 03:02:15 -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-616-Ve-7ajalM6moRh9tdkvULw-1; Mon, 28 Nov 2022 03:02:10 -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 826D4101A56D; Mon, 28 Nov 2022 08:02:09 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 51B0D2027064; Mon, 28 Nov 2022 08:02:09 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id A43F521E65CC; Mon, 28 Nov 2022 09:02:02 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669622533; 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=dEU6Ae8sIPzKwWpjXuPcCz2lmSWx7oC4hlItFz0kK1w=; b=OrrEN9csR31XF9SMicKPv7m2eB/52SvPCpF9zo4xQia4wK64Ps7rmEtCvb1mq3ug7lHCU5 SUsKCiyAAgHpTBLiqd9ENGguBYH/9c8VFHu53uTHO11I3QyLQ17D5ZJ0qXVvOMNC1r9Xg7 2Aedpzx2COL7d12JIAnV4V4cea2vzTo= X-MC-Unique: Ve-7ajalM6moRh9tdkvULw-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: mst@redhat.com, marcel.apfelbaum@gmail.com, dgilbert@redhat.com Subject: [PATCH 12/12] pci: Improve do_pcie_aer_inject_error()'s error messages Date: Mon, 28 Nov 2022 09:02:02 +0100 Message-Id: <20221128080202.2570543-13-armbru@redhat.com> In-Reply-To: <20221128080202.2570543-1-armbru@redhat.com> References: <20221128080202.2570543-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: 1669622992932100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Markus Armbruster Reviewed-by: Dr. David Alan Gilbert Reviewed-by: Michael S. Tsirkin --- 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 0807a206e4..279851bfe6 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,25 +172,21 @@ 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_strtoul(error_name, NULL, 0, &num) < 0 || num > UINT32_MAX) { - 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); @@ -223,12 +220,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