Re: [Qemu-ppc] [Qemu-devel] [PATCH v3 1/6] spapr_pci: remove duplicate macros

[David Gibson]

On Wed, May 06, 2015 at 11:11:05AM +0530, Nikunj A Dadhania wrote:
> Thomas Huth <address@hidden> writes:
> 
> > On Tue,  5 May 2015 14:23:51 +0530
> > Nikunj A Dadhania <address@hidden> wrote:
> >
> >> Signed-off-by: Nikunj A Dadhania <address@hidden>
> >> ---
> >>  hw/ppc/spapr_pci.c | 11 -----------
> >>  1 file changed, 11 deletions(-)
> >> 
> >> diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c
> >> index 2e7590c..4df3a33 100644
> >> --- a/hw/ppc/spapr_pci.c
> >> +++ b/hw/ppc/spapr_pci.c
> >> @@ -1475,17 +1475,6 @@ PCIHostState *spapr_create_phb(sPAPREnvironment 
> >> *spapr, int index)
> >>      return PCI_HOST_BRIDGE(dev);
> >>  }
> >>  
> >> -/* Macros to operate with address in OF binding to PCI */
> >> -#define b_x(x, p, l)    (((x) & ((1<<(l))-1)) << (p))
> >> -#define b_n(x)          b_x((x), 31, 1) /* 0 if relocatable */
> >> -#define b_p(x)          b_x((x), 30, 1) /* 1 if prefetchable */
> >> -#define b_t(x)          b_x((x), 29, 1) /* 1 if the address is aliased */
> >> -#define b_ss(x)         b_x((x), 24, 2) /* the space code */
> >> -#define b_bbbbbbbb(x)   b_x((x), 16, 8) /* bus number */
> >> -#define b_ddddd(x)      b_x((x), 11, 5) /* device number */
> >> -#define b_fff(x)        b_x((x), 8, 3)  /* function number */
> >> -#define b_rrrrrrrr(x)   b_x((x), 0, 8)  /* register number */
> >
> > Seems like the duplication is not in master yet, only in spapr-next,
> > and has apparently been introduced by commit 2c938a6692c01818e 
> > (spapr_pci: enable basic hotplug operations) ...
> > So an alternative would be to fix up that patch instead. David?
> 
> Yes, that would be fine with me as well.

I've amended the patch in spapr-next.

> 
> > Anyway, the duplication should go away, so:
> >
> > Reviewed-by: Thomas Huth <address@hidden>
> 
> Regards
> Nikunj
> 

-- 
David Gibson                    | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au  | minimalist, thank you.  NOT _the_ _other_
                                | _way_ _around_!
http://www.ozlabs.org/~dgibson

pgp3J4GVxvbNN.pgp
Description: PGP signature