On Wed, Jun 15, 2016 at 10:41:49PM +0200, Markus Armbruster wrote: > Signed-off-by: Markus Armbruster <arm...@redhat.com>
Agree with Eric about squashing this. Reviewed-by: Michael S. Tsirkin <m...@redhat.com> > --- > include/qemu/range.h | 21 --------------------- > util/range.c | 1 - > 2 files changed, 22 deletions(-) > > diff --git a/include/qemu/range.h b/include/qemu/range.h > index 9296ba0..c8c46a9 100644 > --- a/include/qemu/range.h > +++ b/include/qemu/range.h > @@ -30,16 +30,6 @@ > * - this can not represent a full 0 to ~0x0LL range. > */ > > -bool range_is_empty(Range *range); > -bool range_contains(Range *range, uint64_t val); > -void range_make_empty(Range *range); > -void range_set_bounds(Range *range, uint64_t lob, uint64_t upb); > -void range_set_bounds1(Range *range, uint64_t lob, uint64_t upb_plus1); > -uint64_t range_lob(Range *range); > -uint64_t range_upb(Range *range); > -void range_extend(Range *range, Range *extend_by); > -#ifdef RANGE_IMPL > - > /* A structure representing a range of addresses. */ > struct Range { > uint64_t begin; /* First byte of the range, or 0 if empty. */ > @@ -52,9 +42,6 @@ static inline void range_invariant(Range *range) > || range->begin <= range->end - 1); /* non-empty */ > } > > -#define static > -#define inline > - > /* Compound literal encoding the empty range */ > #define range_empty ((Range){ .begin = 0, .end = 0 }) > > @@ -148,14 +135,6 @@ static inline void range_extend(Range *range, Range > *extend_by) > assert(!range_is_empty(range)); > } > > -#undef static > -#undef inline > -#else > -struct Range { > - uint64_t begin_, end_; > -}; > -#endif > - > /* Get last byte of a range from offset + length. > * Undefined for ranges that wrap around 0. */ > static inline uint64_t range_get_last(uint64_t offset, uint64_t len) > diff --git a/util/range.c b/util/range.c > index ab5102a..ca149a0 100644 > --- a/util/range.c > +++ b/util/range.c > @@ -19,7 +19,6 @@ > */ > > #include "qemu/osdep.h" > -#define RANGE_IMPL > #include "qemu/range.h" > > /* > -- > 2.5.5