[PATCH] trace-events,pci: unify trace events format

Laurent Vivier posted 1 patch 2 years, 6 months ago
Test checkpatch passed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20211105192541.655831-1-lvivier@redhat.com
Maintainers: "Michael S. Tsirkin" <mst@redhat.com>, Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
hw/pci/pci.c        | 4 ++--
hw/pci/pci_host.c   | 6 ++++--
hw/pci/trace-events | 8 ++++----
3 files changed, 10 insertions(+), 8 deletions(-)
[PATCH] trace-events,pci: unify trace events format
Posted by Laurent Vivier 2 years, 6 months ago
Unify format used by trace_pci_update_mappings_del(),
trace_pci_update_mappings_add(), trace_pci_cfg_write() and
trace_pci_cfg_read() to print the device name and bus number,
slot number and function number.

For instance:

  pci_cfg_read virtio-net-pci 00:0 @0x20 -> 0xffffc00c
  pci_cfg_write virtio-net-pci 00:0 @0x20 <- 0xfea0000c
  pci_update_mappings_del d=0x555810b92330 01:00.0 4,0xffffc000+0x4000
  pci_update_mappings_add d=0x555810b92330 01:00.0 4,0xfea00000+0x4000

becomes

  pci_cfg_read virtio-net-pci 01:00.0 @0x20 -> 0xffffc00c
  pci_cfg_write virtio-net-pci 01:00.0 @0x20 <- 0xfea0000c
  pci_update_mappings_del virtio-net-pci 01:00.0 4,0xffffc000+0x4000
  pci_update_mappings_add virtio-net-pci 01:00.0 4,0xfea00000+0x4000

Signed-off-by: Laurent Vivier <lvivier@redhat.com>
---
 hw/pci/pci.c        | 4 ++--
 hw/pci/pci_host.c   | 6 ++++--
 hw/pci/trace-events | 8 ++++----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index 4a84e478cef5..9a76905d38c7 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -1387,7 +1387,7 @@ 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_dev_bus_num(d),
+            trace_pci_update_mappings_del(d->name, pci_dev_bus_num(d),
                                           PCI_SLOT(d->devfn),
                                           PCI_FUNC(d->devfn),
                                           i, r->addr, r->size);
@@ -1395,7 +1395,7 @@ static void pci_update_mappings(PCIDevice *d)
         }
         r->addr = new_addr;
         if (r->addr != PCI_BAR_UNMAPPED) {
-            trace_pci_update_mappings_add(d, pci_dev_bus_num(d),
+            trace_pci_update_mappings_add(d->name, pci_dev_bus_num(d),
                                           PCI_SLOT(d->devfn),
                                           PCI_FUNC(d->devfn),
                                           i, r->addr, r->size);
diff --git a/hw/pci/pci_host.c b/hw/pci/pci_host.c
index cf02f0d6a501..0768893aafcf 100644
--- a/hw/pci/pci_host.c
+++ b/hw/pci/pci_host.c
@@ -78,7 +78,8 @@ void pci_host_config_write_common(PCIDevice *pci_dev, uint32_t addr,
         return;
     }
 
-    trace_pci_cfg_write(pci_dev->name, PCI_SLOT(pci_dev->devfn),
+    trace_pci_cfg_write(pci_dev->name, pci_dev_bus_num(pci_dev),
+                        PCI_SLOT(pci_dev->devfn),
                         PCI_FUNC(pci_dev->devfn), addr, val);
     pci_dev->config_write(pci_dev, addr, val, MIN(len, limit - addr));
 }
@@ -102,7 +103,8 @@ uint32_t pci_host_config_read_common(PCIDevice *pci_dev, uint32_t 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),
+    trace_pci_cfg_read(pci_dev->name, pci_dev_bus_num(pci_dev),
+                       PCI_SLOT(pci_dev->devfn),
                        PCI_FUNC(pci_dev->devfn), addr, ret);
 
     return ret;
diff --git a/hw/pci/trace-events b/hw/pci/trace-events
index fc777d0b5e6e..7570752c4045 100644
--- a/hw/pci/trace-events
+++ b/hw/pci/trace-events
@@ -1,12 +1,12 @@
 # See docs/devel/tracing.rst for syntax documentation.
 
 # pci.c
-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,0x%"PRIx64"+0x%"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,0x%"PRIx64"+0x%"PRIx64
+pci_update_mappings_del(const char *dev, uint32_t bus, uint32_t slot, uint32_t func, int bar, uint64_t addr, uint64_t size) "%s %02x:%02x.%x %d,0x%"PRIx64"+0x%"PRIx64
+pci_update_mappings_add(const char *dev, uint32_t bus, uint32_t slot, uint32_t func, int bar, uint64_t addr, uint64_t size) "%s %02x:%02x.%x %d,0x%"PRIx64"+0x%"PRIx64
 
 # 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"
+pci_cfg_read(const char *dev, uint32_t bus, uint32_t slot, uint32_t func, unsigned offs, unsigned val) "%s %02x:%02x.%x @0x%x -> 0x%x"
+pci_cfg_write(const char *dev, uint32_t bus, uint32_t slot, uint32_t func, unsigned offs, unsigned val) "%s %02x:%02x.%x @0x%x <- 0x%x"
 
 # msix.c
 msix_write_config(char *name, bool enabled, bool masked) "dev %s enabled %d masked %d"
-- 
2.31.1


Re: [PATCH] trace-events,pci: unify trace events format
Posted by wangyanan (Y) 2 years, 6 months ago
On 2021/11/6 3:25, Laurent Vivier wrote:
> Unify format used by trace_pci_update_mappings_del(),
> trace_pci_update_mappings_add(), trace_pci_cfg_write() and
> trace_pci_cfg_read() to print the device name and bus number,
> slot number and function number.
>
> For instance:
>
>    pci_cfg_read virtio-net-pci 00:0 @0x20 -> 0xffffc00c
>    pci_cfg_write virtio-net-pci 00:0 @0x20 <- 0xfea0000c
>    pci_update_mappings_del d=0x555810b92330 01:00.0 4,0xffffc000+0x4000
>    pci_update_mappings_add d=0x555810b92330 01:00.0 4,0xfea00000+0x4000
>
> becomes
>
>    pci_cfg_read virtio-net-pci 01:00.0 @0x20 -> 0xffffc00c
>    pci_cfg_write virtio-net-pci 01:00.0 @0x20 <- 0xfea0000c
>    pci_update_mappings_del virtio-net-pci 01:00.0 4,0xffffc000+0x4000
>    pci_update_mappings_add virtio-net-pci 01:00.0 4,0xfea00000+0x4000
>
> Signed-off-by: Laurent Vivier <lvivier@redhat.com>
> ---
>   hw/pci/pci.c        | 4 ++--
>   hw/pci/pci_host.c   | 6 ++++--
>   hw/pci/trace-events | 8 ++++----
>   3 files changed, 10 insertions(+), 8 deletions(-)
>
> diff --git a/hw/pci/pci.c b/hw/pci/pci.c
> index 4a84e478cef5..9a76905d38c7 100644
> --- a/hw/pci/pci.c
> +++ b/hw/pci/pci.c
> @@ -1387,7 +1387,7 @@ 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_dev_bus_num(d),
> +            trace_pci_update_mappings_del(d->name, pci_dev_bus_num(d),
>                                             PCI_SLOT(d->devfn),
>                                             PCI_FUNC(d->devfn),
>                                             i, r->addr, r->size);
> @@ -1395,7 +1395,7 @@ static void pci_update_mappings(PCIDevice *d)
>           }
>           r->addr = new_addr;
>           if (r->addr != PCI_BAR_UNMAPPED) {
> -            trace_pci_update_mappings_add(d, pci_dev_bus_num(d),
> +            trace_pci_update_mappings_add(d->name, pci_dev_bus_num(d),
>                                             PCI_SLOT(d->devfn),
>                                             PCI_FUNC(d->devfn),
>                                             i, r->addr, r->size);
> diff --git a/hw/pci/pci_host.c b/hw/pci/pci_host.c
> index cf02f0d6a501..0768893aafcf 100644
> --- a/hw/pci/pci_host.c
> +++ b/hw/pci/pci_host.c
> @@ -78,7 +78,8 @@ void pci_host_config_write_common(PCIDevice *pci_dev, uint32_t addr,
>           return;
>       }
>   
> -    trace_pci_cfg_write(pci_dev->name, PCI_SLOT(pci_dev->devfn),
> +    trace_pci_cfg_write(pci_dev->name, pci_dev_bus_num(pci_dev),
> +                        PCI_SLOT(pci_dev->devfn),
>                           PCI_FUNC(pci_dev->devfn), addr, val);
>       pci_dev->config_write(pci_dev, addr, val, MIN(len, limit - addr));
>   }
> @@ -102,7 +103,8 @@ uint32_t pci_host_config_read_common(PCIDevice *pci_dev, uint32_t 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),
> +    trace_pci_cfg_read(pci_dev->name, pci_dev_bus_num(pci_dev),
> +                       PCI_SLOT(pci_dev->devfn),
>                          PCI_FUNC(pci_dev->devfn), addr, ret);
>   
>       return ret;
> diff --git a/hw/pci/trace-events b/hw/pci/trace-events
> index fc777d0b5e6e..7570752c4045 100644
> --- a/hw/pci/trace-events
> +++ b/hw/pci/trace-events
> @@ -1,12 +1,12 @@
>   # See docs/devel/tracing.rst for syntax documentation.
>   
>   # pci.c
> -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,0x%"PRIx64"+0x%"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,0x%"PRIx64"+0x%"PRIx64
> +pci_update_mappings_del(const char *dev, uint32_t bus, uint32_t slot, uint32_t func, int bar, uint64_t addr, uint64_t size) "%s %02x:%02x.%x %d,0x%"PRIx64"+0x%"PRIx64
> +pci_update_mappings_add(const char *dev, uint32_t bus, uint32_t slot, uint32_t func, int bar, uint64_t addr, uint64_t size) "%s %02x:%02x.%x %d,0x%"PRIx64"+0x%"PRIx64
>   
>   # 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"
> +pci_cfg_read(const char *dev, uint32_t bus, uint32_t slot, uint32_t func, unsigned offs, unsigned val) "%s %02x:%02x.%x @0x%x -> 0x%x"
> +pci_cfg_write(const char *dev, uint32_t bus, uint32_t slot, uint32_t func, unsigned offs, unsigned val) "%s %02x:%02x.%x @0x%x <- 0x%x"
>   
>   # msix.c
>   msix_write_config(char *name, bool enabled, bool masked) "dev %s enabled %d masked %d"
Reviewed-by: Yanan Wang <wangyanan55@huawei.com>


Re: [PATCH] trace-events,pci: unify trace events format
Posted by Michael S. Tsirkin 2 years, 6 months ago
On Fri, Nov 05, 2021 at 08:25:41PM +0100, Laurent Vivier wrote:
> Unify format used by trace_pci_update_mappings_del(),
> trace_pci_update_mappings_add(), trace_pci_cfg_write() and
> trace_pci_cfg_read() to print the device name and bus number,
> slot number and function number.
> 
> For instance:
> 
>   pci_cfg_read virtio-net-pci 00:0 @0x20 -> 0xffffc00c
>   pci_cfg_write virtio-net-pci 00:0 @0x20 <- 0xfea0000c
>   pci_update_mappings_del d=0x555810b92330 01:00.0 4,0xffffc000+0x4000
>   pci_update_mappings_add d=0x555810b92330 01:00.0 4,0xfea00000+0x4000
> 
> becomes
> 
>   pci_cfg_read virtio-net-pci 01:00.0 @0x20 -> 0xffffc00c
>   pci_cfg_write virtio-net-pci 01:00.0 @0x20 <- 0xfea0000c
>   pci_update_mappings_del virtio-net-pci 01:00.0 4,0xffffc000+0x4000
>   pci_update_mappings_add virtio-net-pci 01:00.0 4,0xfea00000+0x4000
> 
> Signed-off-by: Laurent Vivier <lvivier@redhat.com>


Looks good to me. We are in freeze, will queue. Pls ping after
the release to make sure it's not lost.

> ---
>  hw/pci/pci.c        | 4 ++--
>  hw/pci/pci_host.c   | 6 ++++--
>  hw/pci/trace-events | 8 ++++----
>  3 files changed, 10 insertions(+), 8 deletions(-)
> 
> diff --git a/hw/pci/pci.c b/hw/pci/pci.c
> index 4a84e478cef5..9a76905d38c7 100644
> --- a/hw/pci/pci.c
> +++ b/hw/pci/pci.c
> @@ -1387,7 +1387,7 @@ 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_dev_bus_num(d),
> +            trace_pci_update_mappings_del(d->name, pci_dev_bus_num(d),
>                                            PCI_SLOT(d->devfn),
>                                            PCI_FUNC(d->devfn),
>                                            i, r->addr, r->size);
> @@ -1395,7 +1395,7 @@ static void pci_update_mappings(PCIDevice *d)
>          }
>          r->addr = new_addr;
>          if (r->addr != PCI_BAR_UNMAPPED) {
> -            trace_pci_update_mappings_add(d, pci_dev_bus_num(d),
> +            trace_pci_update_mappings_add(d->name, pci_dev_bus_num(d),
>                                            PCI_SLOT(d->devfn),
>                                            PCI_FUNC(d->devfn),
>                                            i, r->addr, r->size);
> diff --git a/hw/pci/pci_host.c b/hw/pci/pci_host.c
> index cf02f0d6a501..0768893aafcf 100644
> --- a/hw/pci/pci_host.c
> +++ b/hw/pci/pci_host.c
> @@ -78,7 +78,8 @@ void pci_host_config_write_common(PCIDevice *pci_dev, uint32_t addr,
>          return;
>      }
>  
> -    trace_pci_cfg_write(pci_dev->name, PCI_SLOT(pci_dev->devfn),
> +    trace_pci_cfg_write(pci_dev->name, pci_dev_bus_num(pci_dev),
> +                        PCI_SLOT(pci_dev->devfn),
>                          PCI_FUNC(pci_dev->devfn), addr, val);
>      pci_dev->config_write(pci_dev, addr, val, MIN(len, limit - addr));
>  }
> @@ -102,7 +103,8 @@ uint32_t pci_host_config_read_common(PCIDevice *pci_dev, uint32_t 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),
> +    trace_pci_cfg_read(pci_dev->name, pci_dev_bus_num(pci_dev),
> +                       PCI_SLOT(pci_dev->devfn),
>                         PCI_FUNC(pci_dev->devfn), addr, ret);
>  
>      return ret;
> diff --git a/hw/pci/trace-events b/hw/pci/trace-events
> index fc777d0b5e6e..7570752c4045 100644
> --- a/hw/pci/trace-events
> +++ b/hw/pci/trace-events
> @@ -1,12 +1,12 @@
>  # See docs/devel/tracing.rst for syntax documentation.
>  
>  # pci.c
> -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,0x%"PRIx64"+0x%"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,0x%"PRIx64"+0x%"PRIx64
> +pci_update_mappings_del(const char *dev, uint32_t bus, uint32_t slot, uint32_t func, int bar, uint64_t addr, uint64_t size) "%s %02x:%02x.%x %d,0x%"PRIx64"+0x%"PRIx64
> +pci_update_mappings_add(const char *dev, uint32_t bus, uint32_t slot, uint32_t func, int bar, uint64_t addr, uint64_t size) "%s %02x:%02x.%x %d,0x%"PRIx64"+0x%"PRIx64
>  
>  # 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"
> +pci_cfg_read(const char *dev, uint32_t bus, uint32_t slot, uint32_t func, unsigned offs, unsigned val) "%s %02x:%02x.%x @0x%x -> 0x%x"
> +pci_cfg_write(const char *dev, uint32_t bus, uint32_t slot, uint32_t func, unsigned offs, unsigned val) "%s %02x:%02x.%x @0x%x <- 0x%x"
>  
>  # msix.c
>  msix_write_config(char *name, bool enabled, bool masked) "dev %s enabled %d masked %d"
> -- 
> 2.31.1


Re: [PATCH] trace-events,pci: unify trace events format
Posted by Laurent Vivier 2 years, 4 months ago
On 07/11/2021 09:38, Michael S. Tsirkin wrote:
> On Fri, Nov 05, 2021 at 08:25:41PM +0100, Laurent Vivier wrote:
>> Unify format used by trace_pci_update_mappings_del(),
>> trace_pci_update_mappings_add(), trace_pci_cfg_write() and
>> trace_pci_cfg_read() to print the device name and bus number,
>> slot number and function number.
>>
>> For instance:
>>
>>    pci_cfg_read virtio-net-pci 00:0 @0x20 -> 0xffffc00c
>>    pci_cfg_write virtio-net-pci 00:0 @0x20 <- 0xfea0000c
>>    pci_update_mappings_del d=0x555810b92330 01:00.0 4,0xffffc000+0x4000
>>    pci_update_mappings_add d=0x555810b92330 01:00.0 4,0xfea00000+0x4000
>>
>> becomes
>>
>>    pci_cfg_read virtio-net-pci 01:00.0 @0x20 -> 0xffffc00c
>>    pci_cfg_write virtio-net-pci 01:00.0 @0x20 <- 0xfea0000c
>>    pci_update_mappings_del virtio-net-pci 01:00.0 4,0xffffc000+0x4000
>>    pci_update_mappings_add virtio-net-pci 01:00.0 4,0xfea00000+0x4000
>>
>> Signed-off-by: Laurent Vivier <lvivier@redhat.com>
>
> Looks good to me. We are in freeze, will queue. Pls ping after
> the release to make sure it's not lost.

Ping ?

Thanks,

Laurent


Re: [PATCH] trace-events,pci: unify trace events format
Posted by Laurent Vivier 2 years, 4 months ago
On 15/12/2021 11:57, Laurent Vivier wrote:
> On 07/11/2021 09:38, Michael S. Tsirkin wrote:
>> On Fri, Nov 05, 2021 at 08:25:41PM +0100, Laurent Vivier wrote:
>>> Unify format used by trace_pci_update_mappings_del(),
>>> trace_pci_update_mappings_add(), trace_pci_cfg_write() and
>>> trace_pci_cfg_read() to print the device name and bus number,
>>> slot number and function number.
>>>
>>> For instance:
>>>
>>>    pci_cfg_read virtio-net-pci 00:0 @0x20 -> 0xffffc00c
>>>    pci_cfg_write virtio-net-pci 00:0 @0x20 <- 0xfea0000c
>>>    pci_update_mappings_del d=0x555810b92330 01:00.0 4,0xffffc000+0x4000
>>>    pci_update_mappings_add d=0x555810b92330 01:00.0 4,0xfea00000+0x4000
>>>
>>> becomes
>>>
>>>    pci_cfg_read virtio-net-pci 01:00.0 @0x20 -> 0xffffc00c
>>>    pci_cfg_write virtio-net-pci 01:00.0 @0x20 <- 0xfea0000c
>>>    pci_update_mappings_del virtio-net-pci 01:00.0 4,0xffffc000+0x4000
>>>    pci_update_mappings_add virtio-net-pci 01:00.0 4,0xfea00000+0x4000
>>>
>>> Signed-off-by: Laurent Vivier <lvivier@redhat.com>
>>
>> Looks good to me. We are in freeze, will queue. Pls ping after
>> the release to make sure it's not lost.
> 
> Ping ?

Well, it seems really lost...

Thanks,
Laurent


Re: [PATCH] trace-events,pci: unify trace events format
Posted by Michael S. Tsirkin 2 years, 4 months ago
On Wed, Dec 15, 2021 at 11:57:58AM +0100, Laurent Vivier wrote:
> On 07/11/2021 09:38, Michael S. Tsirkin wrote:
> > On Fri, Nov 05, 2021 at 08:25:41PM +0100, Laurent Vivier wrote:
> > > Unify format used by trace_pci_update_mappings_del(),
> > > trace_pci_update_mappings_add(), trace_pci_cfg_write() and
> > > trace_pci_cfg_read() to print the device name and bus number,
> > > slot number and function number.
> > > 
> > > For instance:
> > > 
> > >    pci_cfg_read virtio-net-pci 00:0 @0x20 -> 0xffffc00c
> > >    pci_cfg_write virtio-net-pci 00:0 @0x20 <- 0xfea0000c
> > >    pci_update_mappings_del d=0x555810b92330 01:00.0 4,0xffffc000+0x4000
> > >    pci_update_mappings_add d=0x555810b92330 01:00.0 4,0xfea00000+0x4000
> > > 
> > > becomes
> > > 
> > >    pci_cfg_read virtio-net-pci 01:00.0 @0x20 -> 0xffffc00c
> > >    pci_cfg_write virtio-net-pci 01:00.0 @0x20 <- 0xfea0000c
> > >    pci_update_mappings_del virtio-net-pci 01:00.0 4,0xffffc000+0x4000
> > >    pci_update_mappings_add virtio-net-pci 01:00.0 4,0xfea00000+0x4000
> > > 
> > > Signed-off-by: Laurent Vivier <lvivier@redhat.com>
> > 
> > Looks good to me. We are in freeze, will queue. Pls ping after
> > the release to make sure it's not lost.
> 
> Ping ?
> 
> Thanks,
> 
> Laurent

tagged now, thanks!


Re: [PATCH] trace-events,pci: unify trace events format
Posted by Philippe Mathieu-Daudé 2 years, 6 months ago
On 11/5/21 20:25, Laurent Vivier wrote:
> Unify format used by trace_pci_update_mappings_del(),
> trace_pci_update_mappings_add(), trace_pci_cfg_write() and
> trace_pci_cfg_read() to print the device name and bus number,
> slot number and function number.
> 
> For instance:
> 
>   pci_cfg_read virtio-net-pci 00:0 @0x20 -> 0xffffc00c
>   pci_cfg_write virtio-net-pci 00:0 @0x20 <- 0xfea0000c
>   pci_update_mappings_del d=0x555810b92330 01:00.0 4,0xffffc000+0x4000
>   pci_update_mappings_add d=0x555810b92330 01:00.0 4,0xfea00000+0x4000
> 
> becomes
> 
>   pci_cfg_read virtio-net-pci 01:00.0 @0x20 -> 0xffffc00c
>   pci_cfg_write virtio-net-pci 01:00.0 @0x20 <- 0xfea0000c
>   pci_update_mappings_del virtio-net-pci 01:00.0 4,0xffffc000+0x4000
>   pci_update_mappings_add virtio-net-pci 01:00.0 4,0xfea00000+0x4000
> 
> Signed-off-by: Laurent Vivier <lvivier@redhat.com>
> ---
>  hw/pci/pci.c        | 4 ++--
>  hw/pci/pci_host.c   | 6 ++++--
>  hw/pci/trace-events | 8 ++++----
>  3 files changed, 10 insertions(+), 8 deletions(-)

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>