Philippe Mathieu-Daudé <phi...@redhat.com> writes: > On 8/6/19 5:14 PM, Markus Armbruster wrote: >> In my "build everything" tree, changing qemu/main-loop.h triggers a >> recompile of some 5600 out of 6600 objects (not counting tests and >> objects that don't depend on qemu/osdep.h). It includes block/aio.h, >> which in turn includes qemu/event_notifier.h, qemu/notify.h, >> qemu/processor.h, qemu/qsp.h, qemu/queue.h, qemu/thread-posix.h, >> qemu/thread.h, qemu/timer.h, and a few more. >> >> Include qemu/main-loop.h only where it's needed. Touching it now >> recompiles only some 1700 objects. For block/aio.h and >> qemu/event_notifier.h, these numbers drop from 5600 to 2800. For the >> others, they shrink only slightly. >> >> Signed-off-by: Markus Armbruster <arm...@redhat.com> [...] >> diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h >> index 77f5df59b0..ac18a1184a 100644 >> --- a/include/sysemu/sysemu.h >> +++ b/include/sysemu/sysemu.h >> @@ -5,7 +5,6 @@ >> #include "qapi/qapi-types-run-state.h" >> #include "qemu/timer.h" >> #include "qemu/notify.h" >> -#include "qemu/main-loop.h" >> #include "qemu/bitmap.h" >> #include "qemu/uuid.h" >> #include "qom/object.h" > [...] > > You missed to adapt ui/cocoa.m, building fails on OSX: > > OBJC ui/cocoa.o > ui/cocoa.m:141:19: warning: implicit declaration of function > 'qemu_mutex_iothread_locked' is invalid in C99 > [-Wimplicit-function-declaration] > bool locked = qemu_mutex_iothread_locked(); > ^ > ui/cocoa.m:141:19: warning: this function declaration is not a prototype > [-Wstrict-prototypes] > ui/cocoa.m:143:9: warning: implicit declaration of function > 'qemu_mutex_lock_iothread' is invalid in C99 > [-Wimplicit-function-declaration] > qemu_mutex_lock_iothread(); > ^ > ui/cocoa.m:143:9: warning: this function declaration is not a prototype > [-Wstrict-prototypes] > ui/cocoa.m:147:9: warning: implicit declaration of function > 'qemu_mutex_unlock_iothread' is invalid in C99 > [-Wimplicit-function-declaration] > qemu_mutex_unlock_iothread(); > ^ > ui/cocoa.m:147:9: warning: this function declaration is not a prototype > [-Wstrict-prototypes] > ui/cocoa.m:153:19: warning: implicit declaration of function > 'qemu_mutex_iothread_locked' is invalid in C99 > [-Wimplicit-function-declaration] > bool locked = qemu_mutex_iothread_locked(); > ^ > ui/cocoa.m:157:9: warning: implicit declaration of function > 'qemu_mutex_lock_iothread' is invalid in C99 > [-Wimplicit-function-declaration] > qemu_mutex_lock_iothread(); > ^ > ui/cocoa.m:161:9: warning: implicit declaration of function > 'qemu_mutex_unlock_iothread' is invalid in C99 > [-Wimplicit-function-declaration] > qemu_mutex_unlock_iothread(); > ^
Will fix, thanks!