qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Qemu-devel] [PATCH 10/11] sabre: convert from SABRE_DPRINTF macro t


From: Philippe Mathieu-Daudé
Subject: Re: [Qemu-devel] [PATCH 10/11] sabre: convert from SABRE_DPRINTF macro to trace-events
Date: Sun, 14 Jan 2018 10:36:15 -0300
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.2

On 01/14/2018 07:47 AM, Mark Cave-Ayland wrote:
> Signed-off-by: Mark Cave-Ayland <address@hidden>
> ---
>  hw/pci-host/sabre.c      | 32 ++++++++++----------------------
>  hw/pci-host/trace-events | 10 ++++++++++
>  2 files changed, 20 insertions(+), 22 deletions(-)
> 
> diff --git a/hw/pci-host/sabre.c b/hw/pci-host/sabre.c
> index 4054c17598..2268a41dd9 100644
> --- a/hw/pci-host/sabre.c
> +++ b/hw/pci-host/sabre.c
> @@ -36,16 +36,7 @@
>  #include "exec/address-spaces.h"
>  #include "qapi/error.h"
>  #include "qemu/log.h"
> -
> -/* debug sabre */
> -//#define DEBUG_SABRE
> -
> -#ifdef DEBUG_SABRE
> -#define SABRE_DPRINTF(fmt, ...) \
> -do { printf("sabre: " fmt , ## __VA_ARGS__); } while (0)
> -#else
> -#define SABRE_DPRINTF(fmt, ...)
> -#endif
> +#include "trace.h"
>  
>  /*
>   * Chipset docs:
> @@ -69,8 +60,7 @@ do { printf("sabre: " fmt , ## __VA_ARGS__); } while (0)
>  
>  static inline void sabre_set_request(SabreState *s, unsigned int irq_num)
>  {
> -    SABRE_DPRINTF("%s: request irq %d\n", __func__, irq_num);
> -
> +    trace_sabre_set_request(irq_num);
>      s->irq_request = irq_num;
>      qemu_set_irq(s->ivec_irqs[irq_num], 1);
>  }
> @@ -108,7 +98,7 @@ static inline void sabre_check_irqs(SabreState *s)
>  
>  static inline void sabre_clear_request(SabreState *s, unsigned int irq_num)
>  {
> -    SABRE_DPRINTF("%s: clear request irq %d\n", __func__, irq_num);
> +    trace_sabre_clear_request(irq_num);
>      qemu_set_irq(s->ivec_irqs[irq_num], 0);
>      s->irq_request = NO_IRQ_REQUEST;
>  }
> @@ -125,8 +115,7 @@ static void sabre_config_write(void *opaque, hwaddr addr,
>  {
>      SabreState *s = opaque;
>  
> -    SABRE_DPRINTF("%s: addr " TARGET_FMT_plx " val %" PRIx64 "\n", __func__,
> -                  addr, val);
> +    trace_sabre_config_write(addr, val);
>  
>      switch (addr & 0xffff) {
>      case 0x30 ... 0x4f: /* DMA error registers */
> @@ -250,7 +239,7 @@ static uint64_t sabre_config_read(void *opaque,
>          val = 0;
>          break;
>      }
> -    SABRE_DPRINTF("%s: addr " TARGET_FMT_plx " -> %x\n", __func__, addr, 
> val);
> +    trace_sabre_config_read(addr, val);
>  
>      return val;
>  }
> @@ -267,8 +256,7 @@ static void sabre_pci_config_write(void *opaque, hwaddr 
> addr,
>      SabreState *s = opaque;
>      PCIHostState *phb = PCI_HOST_BRIDGE(s);
>  
> -    SABRE_DPRINTF("%s: addr " TARGET_FMT_plx " val %" PRIx64 "\n", __func__,
> -                  addr, val);
> +    trace_sabre_pci_config_write(addr, val);
>      pci_data_write(phb->bus, addr, val, size);
>  }
>  
> @@ -280,7 +268,7 @@ static uint64_t sabre_pci_config_read(void *opaque, 
> hwaddr addr,
>      PCIHostState *phb = PCI_HOST_BRIDGE(s);
>  
>      ret = pci_data_read(phb->bus, addr, size);
> -    SABRE_DPRINTF("%s: addr " TARGET_FMT_plx " -> %x\n", __func__, addr, 
> ret);
> +    trace_sabre_pci_config_read(addr, ret);
>      return ret;
>  }
>  
> @@ -318,7 +306,8 @@ static void pci_sabre_set_irq(void *opaque, int irq_num, 
> int level)
>  {
>      SabreState *s = opaque;
>  
> -    SABRE_DPRINTF("%s: set irq_in %d level %d\n", __func__, irq_num, level);
> +    trace_sabre_pci_set_irq(irq_num, level);
> +
>      /* PCI IRQ map onto the first 32 INO.  */
>      if (irq_num < 32) {
>          if (level) {
> @@ -332,8 +321,7 @@ static void pci_sabre_set_irq(void *opaque, int irq_num, 
> int level)
>      } else {
>          /* OBIO IRQ map onto the next 32 INO.  */
>          if (level) {
> -            SABRE_DPRINTF("%s: set irq %d level %d\n", __func__, irq_num,
> -                          level);
> +            trace_sabre_pci_set_obio_irq(irq_num, level);
>              s->pci_irq_in |= 1ULL << irq_num;
>              if ((s->irq_request == NO_IRQ_REQUEST)
>                  && (s->obio_irq_map[irq_num - 32] & PBM_PCI_IMR_ENABLED)) {
> diff --git a/hw/pci-host/trace-events b/hw/pci-host/trace-events
> index 9284b1fbad..32dfc84692 100644
> --- a/hw/pci-host/trace-events
> +++ b/hw/pci-host/trace-events
> @@ -1 +1,11 @@
>  # See docs/devel/tracing.txt for syntax documentation.
> +
> +# hw/pci-host/sabre.c
> +sabre_set_request(int irq_num) "request irq %d"

unsigned int irq_num, %u?

or maybe simpler to change sabre_clear_request() to take an int.

> +sabre_clear_request(int irq_num) "clear request irq %d"

ditto.

> +sabre_config_write(uint64_t addr, uint64_t val) "addr 0x%"PRIx64" val 
> 0x%"PRIx64
> +sabre_config_read(uint64_t addr, uint64_t val) "addr 0x%"PRIx64" val 
> 0x%"PRIx64
> +sabre_pci_config_write(uint64_t addr, uint64_t val) "addr 0x%"PRIx64" val 
> 0x%"PRIx64
> +sabre_pci_config_read(uint64_t addr, uint64_t val) "addr 0x%"PRIx64" val 
> 0x%"PRIx64

Cool, you cared about replacing TARGET_FMT_plx by PRIx64 :)

> +sabre_pci_set_irq(int irq_num, int level) "set irq_in %d level %d"
> +sabre_pci_set_obio_irq(int irq_num, int level) "set irq %d level %d"

Reviewed-by: Philippe Mathieu-Daudé <address@hidden>



reply via email to

[Prev in Thread] Current Thread [Next in Thread]