Patchwork [22/61] pci: use appropriate PRIs in PCI_DPRINTF().

login
register
mail settings
Submitter Isaku Yamahata
Date Sept. 30, 2009, 10:17 a.m.
Message ID <1254305917-14784-23-git-send-email-yamahata@valinux.co.jp>
Download mbox | patch
Permalink /patch/34556/
State Superseded
Headers show

Comments

Isaku Yamahata - Sept. 30, 2009, 10:17 a.m.
use appropriate PRIs in PCI_DPRINTF() for portability.

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
---
 hw/pci.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)
Michael S. Tsirkin - Sept. 30, 2009, 11:55 a.m.
On Wed, Sep 30, 2009 at 07:17:58PM +0900, Isaku Yamahata wrote:
> use appropriate PRIs in PCI_DPRINTF() for portability.
> 
> Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>


I'm confused. Shouldn't we be getting 64 bit now?

> ---
>  hw/pci.c |   10 ++++++----
>  1 files changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/hw/pci.c b/hw/pci.c
> index 5c59092..4a7568d 100644
> --- a/hw/pci.c
> +++ b/hw/pci.c
> @@ -561,7 +561,7 @@ void pci_data_write(void *opaque, uint32_t addr, uint32_t val, int len)
>      int config_addr, bus_num;
>  
>  #if 0
> -    PCI_DPRINTF("pci_data_write: addr=%08x val=%08x len=%d\n",
> +    PCI_DPRINTF("pci_data_write: addr=%08"PRIx32" val=%08"PRIx32" len=%d\n",
>                  addr, val, len);
>  #endif
>      bus_num = (addr >> 16) & 0xff;
> @@ -573,7 +573,8 @@ void pci_data_write(void *opaque, uint32_t addr, uint32_t val, int len)
>      if (!pci_dev)
>          return;
>      config_addr = addr & 0xff;
> -    PCI_DPRINTF("pci_config_write: %s: addr=%02x val=%08x len=%d\n",
> +    PCI_DPRINTF("pci_config_write: %s: "
> +                "addr=%02"PRIx32" val=%08"PRI32x" len=%d\n",
>                  pci_dev->name, config_addr, val, len);
>      pci_dev->config_write(pci_dev, config_addr, val, len);
>  }
> @@ -609,11 +610,12 @@ uint32_t pci_data_read(void *opaque, uint32_t addr, int len)
>      }
>      config_addr = addr & 0xff;
>      val = pci_dev->config_read(pci_dev, config_addr, len);
> -    PCI_DPRINTF("pci_config_read: %s: addr=%02x val=%08x len=%d\n",
> +    PCI_DPRINTF("pci_config_read: %s: "
> +                "addr=%02"PRIx32" val=%08"PRIx32" len=%d\n",
>                  pci_dev->name, config_addr, val, len);
>   the_end:
>  #if 0
> -    PCI_DPRINTF("pci_data_read: addr=%08x val=%08x len=%d\n",
> +    PCI_DPRINTF("pci_data_read: addr=%08"PRIx32" val=%08"PRIx32" len=%d\n",
>                  addr, val, len);
>  #endif
>      return val;
> -- 
> 1.6.0.2
> 
>
Isaku Yamahata - Oct. 1, 2009, 7:22 a.m.
On Wed, Sep 30, 2009 at 01:55:22PM +0200, Michael S. Tsirkin wrote:
> On Wed, Sep 30, 2009 at 07:17:58PM +0900, Isaku Yamahata wrote:
> > use appropriate PRIs in PCI_DPRINTF() for portability.
> > 
> > Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
> 
> 
> I'm confused. Shouldn't we be getting 64 bit now?

No. The address below is for PCI configuration space offset which 
remains 32 bit.
The address getting 64 bit is pci bus address.


> 
> > ---
> >  hw/pci.c |   10 ++++++----
> >  1 files changed, 6 insertions(+), 4 deletions(-)
> > 
> > diff --git a/hw/pci.c b/hw/pci.c
> > index 5c59092..4a7568d 100644
> > --- a/hw/pci.c
> > +++ b/hw/pci.c
> > @@ -561,7 +561,7 @@ void pci_data_write(void *opaque, uint32_t addr, uint32_t val, int len)
> >      int config_addr, bus_num;
> >  
> >  #if 0
> > -    PCI_DPRINTF("pci_data_write: addr=%08x val=%08x len=%d\n",
> > +    PCI_DPRINTF("pci_data_write: addr=%08"PRIx32" val=%08"PRIx32" len=%d\n",
> >                  addr, val, len);
> >  #endif
> >      bus_num = (addr >> 16) & 0xff;
> > @@ -573,7 +573,8 @@ void pci_data_write(void *opaque, uint32_t addr, uint32_t val, int len)
> >      if (!pci_dev)
> >          return;
> >      config_addr = addr & 0xff;
> > -    PCI_DPRINTF("pci_config_write: %s: addr=%02x val=%08x len=%d\n",
> > +    PCI_DPRINTF("pci_config_write: %s: "
> > +                "addr=%02"PRIx32" val=%08"PRI32x" len=%d\n",
> >                  pci_dev->name, config_addr, val, len);
> >      pci_dev->config_write(pci_dev, config_addr, val, len);
> >  }
> > @@ -609,11 +610,12 @@ uint32_t pci_data_read(void *opaque, uint32_t addr, int len)
> >      }
> >      config_addr = addr & 0xff;
> >      val = pci_dev->config_read(pci_dev, config_addr, len);
> > -    PCI_DPRINTF("pci_config_read: %s: addr=%02x val=%08x len=%d\n",
> > +    PCI_DPRINTF("pci_config_read: %s: "
> > +                "addr=%02"PRIx32" val=%08"PRIx32" len=%d\n",
> >                  pci_dev->name, config_addr, val, len);
> >   the_end:
> >  #if 0
> > -    PCI_DPRINTF("pci_data_read: addr=%08x val=%08x len=%d\n",
> > +    PCI_DPRINTF("pci_data_read: addr=%08"PRIx32" val=%08"PRIx32" len=%d\n",
> >                  addr, val, len);
> >  #endif
> >      return val;
>
Michael S. Tsirkin - Oct. 1, 2009, 8:57 a.m.
On Thu, Oct 01, 2009 at 04:22:03PM +0900, Isaku Yamahata wrote:
> On Wed, Sep 30, 2009 at 01:55:22PM +0200, Michael S. Tsirkin wrote:
> > On Wed, Sep 30, 2009 at 07:17:58PM +0900, Isaku Yamahata wrote:
> > > use appropriate PRIs in PCI_DPRINTF() for portability.
> > > 
> > > Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
> > 
> > 
> > I'm confused. Shouldn't we be getting 64 bit now?
> 
> No. The address below is for PCI configuration space offset which 
> remains 32 bit.
> The address getting 64 bit is pci bus address.

They aren't really 32 bit either. Any number width will do.
So I wonder: can we change this to unsigned and get rid of the PRI horror?

> > 
> > > ---
> > >  hw/pci.c |   10 ++++++----
> > >  1 files changed, 6 insertions(+), 4 deletions(-)
> > > 
> > > diff --git a/hw/pci.c b/hw/pci.c
> > > index 5c59092..4a7568d 100644
> > > --- a/hw/pci.c
> > > +++ b/hw/pci.c
> > > @@ -561,7 +561,7 @@ void pci_data_write(void *opaque, uint32_t addr, uint32_t val, int len)
> > >      int config_addr, bus_num;
> > >  
> > >  #if 0
> > > -    PCI_DPRINTF("pci_data_write: addr=%08x val=%08x len=%d\n",
> > > +    PCI_DPRINTF("pci_data_write: addr=%08"PRIx32" val=%08"PRIx32" len=%d\n",
> > >                  addr, val, len);
> > >  #endif
> > >      bus_num = (addr >> 16) & 0xff;
> > > @@ -573,7 +573,8 @@ void pci_data_write(void *opaque, uint32_t addr, uint32_t val, int len)
> > >      if (!pci_dev)
> > >          return;
> > >      config_addr = addr & 0xff;
> > > -    PCI_DPRINTF("pci_config_write: %s: addr=%02x val=%08x len=%d\n",
> > > +    PCI_DPRINTF("pci_config_write: %s: "
> > > +                "addr=%02"PRIx32" val=%08"PRI32x" len=%d\n",
> > >                  pci_dev->name, config_addr, val, len);
> > >      pci_dev->config_write(pci_dev, config_addr, val, len);
> > >  }
> > > @@ -609,11 +610,12 @@ uint32_t pci_data_read(void *opaque, uint32_t addr, int len)
> > >      }
> > >      config_addr = addr & 0xff;
> > >      val = pci_dev->config_read(pci_dev, config_addr, len);
> > > -    PCI_DPRINTF("pci_config_read: %s: addr=%02x val=%08x len=%d\n",
> > > +    PCI_DPRINTF("pci_config_read: %s: "
> > > +                "addr=%02"PRIx32" val=%08"PRIx32" len=%d\n",
> > >                  pci_dev->name, config_addr, val, len);
> > >   the_end:
> > >  #if 0
> > > -    PCI_DPRINTF("pci_data_read: addr=%08x val=%08x len=%d\n",
> > > +    PCI_DPRINTF("pci_data_read: addr=%08"PRIx32" val=%08"PRIx32" len=%d\n",
> > >                  addr, val, len);
> > >  #endif
> > >      return val;
> > 
> 
> -- 
> yamahata

Patch

diff --git a/hw/pci.c b/hw/pci.c
index 5c59092..4a7568d 100644
--- a/hw/pci.c
+++ b/hw/pci.c
@@ -561,7 +561,7 @@  void pci_data_write(void *opaque, uint32_t addr, uint32_t val, int len)
     int config_addr, bus_num;
 
 #if 0
-    PCI_DPRINTF("pci_data_write: addr=%08x val=%08x len=%d\n",
+    PCI_DPRINTF("pci_data_write: addr=%08"PRIx32" val=%08"PRIx32" len=%d\n",
                 addr, val, len);
 #endif
     bus_num = (addr >> 16) & 0xff;
@@ -573,7 +573,8 @@  void pci_data_write(void *opaque, uint32_t addr, uint32_t val, int len)
     if (!pci_dev)
         return;
     config_addr = addr & 0xff;
-    PCI_DPRINTF("pci_config_write: %s: addr=%02x val=%08x len=%d\n",
+    PCI_DPRINTF("pci_config_write: %s: "
+                "addr=%02"PRIx32" val=%08"PRI32x" len=%d\n",
                 pci_dev->name, config_addr, val, len);
     pci_dev->config_write(pci_dev, config_addr, val, len);
 }
@@ -609,11 +610,12 @@  uint32_t pci_data_read(void *opaque, uint32_t addr, int len)
     }
     config_addr = addr & 0xff;
     val = pci_dev->config_read(pci_dev, config_addr, len);
-    PCI_DPRINTF("pci_config_read: %s: addr=%02x val=%08x len=%d\n",
+    PCI_DPRINTF("pci_config_read: %s: "
+                "addr=%02"PRIx32" val=%08"PRIx32" len=%d\n",
                 pci_dev->name, config_addr, val, len);
  the_end:
 #if 0
-    PCI_DPRINTF("pci_data_read: addr=%08x val=%08x len=%d\n",
+    PCI_DPRINTF("pci_data_read: addr=%08"PRIx32" val=%08"PRIx32" len=%d\n",
                 addr, val, len);
 #endif
     return val;