On 20/01/2015 17:16, Peter Maydell wrote: > qemu-timer.c was including a lot more headers than it needed to, > presumably for historical reasons. In particular, it included > ui/console.h; this now tries to pull in <pixman.h>, which will > cause a compilation failure in --disable-tools --disable-system > configurations when running "make check" (which builds qemu-timer.c, > even though the linux-user binaries themselves don't need it). > > Fix this build failure by trimming down the set of included > headers severely -- we only really need main-loop.h and timer.h. > > Signed-off-by: Peter Maydell <peter.mayd...@linaro.org> > --- > I'm not sure exactly when this broke -- it's not a config I > run as part of pullreq processing. > > qemu-timer.c | 8 ++------ > 1 file changed, 2 insertions(+), 6 deletions(-) > > diff --git a/qemu-timer.c b/qemu-timer.c > index 98d9d1b..a77fb47 100644 > --- a/qemu-timer.c > +++ b/qemu-timer.c > @@ -22,13 +22,9 @@ > * THE SOFTWARE. > */ > > -#include "sysemu/sysemu.h" > -#include "monitor/monitor.h" > -#include "ui/console.h" > - > -#include "hw/hw.h" > - > +#include "qemu/main-loop.h" > #include "qemu/timer.h" > + > #ifdef CONFIG_POSIX > #include <pthread.h> > #endif >
Reviewed-by: Paolo Bonzini <pbonz...@redhat.com>
