[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 7/7] hw/pci: fix pci_update_mappings() trace events
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 7/7] hw/pci: fix pci_update_mappings() trace events |
Date: |
Thu, 10 Sep 2015 12:18:03 +0300 |
From: Laszlo Ersek <address@hidden>
The current trace prototypes and (matching) trace calls lead to
"unorthodox" PCI BDF notation in at least the stderr trace backend. For
example, the four BARs of a QXL video card at 00:01.0 (bus 0, slot 1,
function 0) are traced like this (PID and timestamps removed):
pci_update_mappings_add d=0x7f14a73bf890 00:00.1 0,0x84000000+0x4000000
pci_update_mappings_add d=0x7f14a73bf890 00:00.1 1,0x80000000+0x4000000
pci_update_mappings_add d=0x7f14a73bf890 00:00.1 2,0x88200000+0x2000
pci_update_mappings_add d=0x7f14a73bf890 00:00.1 3,0xd060+0x20
The slot and function values are in reverse order.
Stick with the conventional BDF notation.
Cc: "Michael S. Tsirkin" <address@hidden>
Cc: Don Koch <address@hidden>
Cc: address@hidden
Fixes: 7828d75045
Signed-off-by: Laszlo Ersek <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/pci/pci.c | 4 ++--
trace-events | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index eba7ca2..ccea628 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -1154,16 +1154,16 @@ static void pci_update_mappings(PCIDevice *d)
/* now do the real mapping */
if (r->addr != PCI_BAR_UNMAPPED) {
trace_pci_update_mappings_del(d, pci_bus_num(d->bus),
- PCI_FUNC(d->devfn),
PCI_SLOT(d->devfn),
+ PCI_FUNC(d->devfn),
i, r->addr, r->size);
memory_region_del_subregion(r->address_space, r->memory);
}
r->addr = new_addr;
if (r->addr != PCI_BAR_UNMAPPED) {
trace_pci_update_mappings_add(d, pci_bus_num(d->bus),
- PCI_FUNC(d->devfn),
PCI_SLOT(d->devfn),
+ PCI_FUNC(d->devfn),
i, r->addr, r->size);
memory_region_add_subregion_overlap(r->address_space,
r->addr, r->memory, 1);
diff --git a/trace-events b/trace-events
index 0a82f0c..1684a95 100644
--- a/trace-events
+++ b/trace-events
@@ -1303,8 +1303,8 @@ spapr_pci_lsi_set(const char *busname, int pin, uint32_t
irq) "%s PIN%d IRQ %u"
spapr_pci_msi_retry(unsigned config_addr, unsigned req_num, unsigned max_irqs)
"Guest device at %x asked %u, have only %u"
# hw/pci/pci.c
-pci_update_mappings_del(void *d, uint32_t bus, uint32_t func, uint32_t slot,
int bar, uint64_t addr, uint64_t size) "d=%p %02x:%02x.%x
%d,%#"PRIx64"+%#"PRIx64
-pci_update_mappings_add(void *d, uint32_t bus, uint32_t func, uint32_t slot,
int bar, uint64_t addr, uint64_t size) "d=%p %02x:%02x.%x
%d,%#"PRIx64"+%#"PRIx64
+pci_update_mappings_del(void *d, uint32_t bus, uint32_t slot, uint32_t func,
int bar, uint64_t addr, uint64_t size) "d=%p %02x:%02x.%x
%d,%#"PRIx64"+%#"PRIx64
+pci_update_mappings_add(void *d, uint32_t bus, uint32_t slot, uint32_t func,
int bar, uint64_t addr, uint64_t size) "d=%p %02x:%02x.%x
%d,%#"PRIx64"+%#"PRIx64
# hw/net/pcnet.c
pcnet_s_reset(void *s) "s=%p"
--
MST
- [Qemu-devel] [PULL 0/7] virtio,pc,acpi fixes, cleanups, Michael S. Tsirkin, 2015/09/10
- [Qemu-devel] [PULL 1/7] pci: Fix pci_device_iommu_address_space() bus propagation, Michael S. Tsirkin, 2015/09/10
- [Qemu-devel] [PULL 2/7] pc: Remove redundant arguments from xen_hvm_init(), Michael S. Tsirkin, 2015/09/10
- [Qemu-devel] [PULL 4/7] acpi: Remove unused definition., Michael S. Tsirkin, 2015/09/10
- [Qemu-devel] [PULL 5/7] pc: memhotplug: fix incorrectly set reserved-memory-end, Michael S. Tsirkin, 2015/09/10
- [Qemu-devel] [PULL 3/7] virtio: avoid leading underscores for helpers, Michael S. Tsirkin, 2015/09/10
- [Qemu-devel] [PULL 6/7] pc: memhotplug: keep reserved-memory-end broken on 2.4 and earlier machines, Michael S. Tsirkin, 2015/09/10
- [Qemu-devel] [PULL 7/7] hw/pci: fix pci_update_mappings() trace events,
Michael S. Tsirkin <=
- Re: [Qemu-devel] [PULL 0/7] virtio,pc,acpi fixes, cleanups, Peter Maydell, 2015/09/10