| Message ID | 1401838892-2073-1-git-send-email-peter.maydell@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
Il 04/06/2014 01:41, Peter Maydell ha scritto: > The function popcountl() in hbitmap.c is effectively a reimplementation > of what host-utils.h provides as ctpopl(). Use ctpopl() directly; this fixes > a failure to compile on NetBSD (whose strings.h erroneously exposes a > system popcountl() which clashes with this one). > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > Reported-by: Martin Husemann <martin@duskware.de> > --- > We haven't compiled on NetBSD for over a year... > > util/hbitmap.c | 9 ++------- > 1 file changed, 2 insertions(+), 7 deletions(-) > > diff --git a/util/hbitmap.c b/util/hbitmap.c > index d936831..b3060e6 100644 > --- a/util/hbitmap.c > +++ b/util/hbitmap.c > @@ -92,11 +92,6 @@ struct HBitmap { > unsigned long *levels[HBITMAP_LEVELS]; > }; > > -static inline int popcountl(unsigned long l) > -{ > - return BITS_PER_LONG == 32 ? ctpop32(l) : ctpop64(l); > -} > - > /* Advance hbi to the next nonzero word and return it. hbi->pos > * is updated. Returns zero if we reach the end of the bitmap. > */ > @@ -200,14 +195,14 @@ static uint64_t hb_count_between(HBitmap *hb, uint64_t start, uint64_t last) > if (pos >= (end >> BITS_PER_LEVEL)) { > break; > } > - count += popcountl(cur); > + count += ctpopl(cur); > } > > if (pos == (end >> BITS_PER_LEVEL)) { > /* Drop bits representing the END-th and subsequent items. */ > int bit = end & (BITS_PER_LONG - 1); > cur &= (1UL << bit) - 1; > - count += popcountl(cur); > + count += ctpopl(cur); > } > > return count; > Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
diff --git a/util/hbitmap.c b/util/hbitmap.c index d936831..b3060e6 100644 --- a/util/hbitmap.c +++ b/util/hbitmap.c @@ -92,11 +92,6 @@ struct HBitmap { unsigned long *levels[HBITMAP_LEVELS]; }; -static inline int popcountl(unsigned long l) -{ - return BITS_PER_LONG == 32 ? ctpop32(l) : ctpop64(l); -} - /* Advance hbi to the next nonzero word and return it. hbi->pos * is updated. Returns zero if we reach the end of the bitmap. */ @@ -200,14 +195,14 @@ static uint64_t hb_count_between(HBitmap *hb, uint64_t start, uint64_t last) if (pos >= (end >> BITS_PER_LEVEL)) { break; } - count += popcountl(cur); + count += ctpopl(cur); } if (pos == (end >> BITS_PER_LEVEL)) { /* Drop bits representing the END-th and subsequent items. */ int bit = end & (BITS_PER_LONG - 1); cur &= (1UL << bit) - 1; - count += popcountl(cur); + count += ctpopl(cur); } return count;
The function popcountl() in hbitmap.c is effectively a reimplementation of what host-utils.h provides as ctpopl(). Use ctpopl() directly; this fixes a failure to compile on NetBSD (whose strings.h erroneously exposes a system popcountl() which clashes with this one). Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reported-by: Martin Husemann <martin@duskware.de> --- We haven't compiled on NetBSD for over a year... util/hbitmap.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)