From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59839) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VC0FS-00043o-Pd for qemu-devel@nongnu.org; Wed, 21 Aug 2013 00:42:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VC0FM-0002P6-BM for qemu-devel@nongnu.org; Wed, 21 Aug 2013 00:42:22 -0400 Received: from mail-pa0-f52.google.com ([209.85.220.52]:41530) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VC0FM-0002OH-3D for qemu-devel@nongnu.org; Wed, 21 Aug 2013 00:42:16 -0400 Received: by mail-pa0-f52.google.com with SMTP id kq13so342461pab.39 for ; Tue, 20 Aug 2013 21:42:14 -0700 (PDT) From: Alexey Kardashevskiy Date: Wed, 21 Aug 2013 14:42:06 +1000 Message-Id: <1377060126-6234-1-git-send-email-aik@ozlabs.ru> Subject: [Qemu-devel] [PATCH v2] pci: add config space access traces List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Alexey Kardashevskiy , "Michael S . Tsirkin" This adds pci_cfg_read and pci_cfg_write traces for config spaces accesses. Signed-off-by: Alexey Kardashevskiy --- Changes: v2: * added slot and function numbers into traces * added arrows in trace strings --- hw/pci/pci_host.c | 11 ++++++++++- trace-events | 4 ++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/hw/pci/pci_host.c b/hw/pci/pci_host.c index 7dd9b25..77c7d1f 100644 --- a/hw/pci/pci_host.c +++ b/hw/pci/pci_host.c @@ -20,6 +20,7 @@ #include "hw/pci/pci.h" #include "hw/pci/pci_host.h" +#include "trace.h" /* debug PCI */ //#define DEBUG_PCI @@ -51,14 +52,22 @@ void pci_host_config_write_common(PCIDevice *pci_dev, uint32_t addr, uint32_t limit, uint32_t val, uint32_t len) { assert(len <= 4); + trace_pci_cfg_write(pci_dev->name, PCI_SLOT(pci_dev->devfn), + PCI_FUNC(pci_dev->devfn), addr, val); pci_dev->config_write(pci_dev, addr, val, MIN(len, limit - addr)); } uint32_t pci_host_config_read_common(PCIDevice *pci_dev, uint32_t addr, uint32_t limit, uint32_t len) { + uint32_t ret; + assert(len <= 4); - return pci_dev->config_read(pci_dev, addr, MIN(len, limit - addr)); + ret = pci_dev->config_read(pci_dev, addr, MIN(len, limit - addr)); + trace_pci_cfg_read(pci_dev->name, PCI_SLOT(pci_dev->devfn), + PCI_FUNC(pci_dev->devfn), addr, ret); + + return ret; } void pci_data_write(PCIBus *s, uint32_t addr, uint32_t val, int len) diff --git a/trace-events b/trace-events index 3856b5c..9d1d1df 100644 --- a/trace-events +++ b/trace-events @@ -1176,3 +1176,7 @@ object_class_dynamic_cast_assert(const char *type, const char *target, const cha # hw/xen/xen_pvdevice.c xen_pv_mmio_read(uint64_t addr) "WARNING: read from Xen PV Device MMIO space (address %"PRIx64")" xen_pv_mmio_write(uint64_t addr) "WARNING: write to Xen PV Device MMIO space (address %"PRIx64")" + +# hw/pci/pci_host.c +pci_cfg_read(const char *dev, unsigned devid, unsigned fnid, unsigned offs, unsigned val) "%s %02u:%u @0x%x -> 0x%x" +pci_cfg_write(const char *dev, unsigned devid, unsigned fnid, unsigned offs, unsigned val) "%s %02u:%u @0x%x <- 0x%x" -- 1.8.3.2