On 8/16/19 1:23 PM, Philippe Mathieu-Daudé wrote: > On 8/16/19 12:59 PM, Peter Maydell wrote: >> On Tue, 13 Aug 2019 at 16:54, Markus Armbruster <arm...@redhat.com> wrote: >>> >>> The following changes since commit 864ab314f1d924129d06ac7b571f105a2b76a4b2: >>> >>> Update version for v4.1.0-rc4 release (2019-08-06 17:05:21 +0100) >>> >>> are available in the Git repository at: >>> >>> git://repo.or.cz/qemu/armbru.git tags/pull-include-2019-08-13 >>> >>> for you to fetch changes up to 8d111fd683b678d3826e192bc07ffcc349a118b5: >>> >>> sysemu: Split sysemu/runstate.h off sysemu/sysemu.h (2019-08-13 13:16:20 >>> +0200) >>> >>> ---------------------------------------------------------------- >>> Header cleanup patches for 2019-08-13 >>> >>> ---------------------------------------------------------------- >>> These patches are rather bothersome to rebase, so I'd like to get them >>> into 4.2 early. >>> >> >> Fails to build on OSX I'm afraid: >> /Users/pm215/src/qemu-for-merges/ui/cocoa.m:1166:5: error: implicit >> declaration of function 'qemu_system_shutdown_request' is invalid in >> C99 [-Werror,-Wimplicit-function-declaration] >> qemu_system_shutdown_request(SHUTDOWN_CAUSE_HOST_UI); >> ^ > > Ah I reported this one while reviewing v2: > https://lists.gnu.org/archive/html/qemu-devel/2019-08/msg01150.html > > Then didn't take the time to test OSX on v4 :( > > BTW Travis should find this.
Actually I did try v4 on Travis and it succeeded: https://travis-ci.org/philmd/qemu/builds/570743079 But Travis seems to have updated smth on their OSX images (or brew is down?), now I get: ERROR: glib-2.40 gthread-2.0 is required to compile QEMU Anyway, the culprit is: commit 8d111fd683b678d3826e192bc07ffcc349a118b5 (tag: pull-include-2019-08-13) Author: Markus Armbruster <arm...@redhat.com> Date: Mon Aug 12 07:23:59 2019 +0200 sysemu: Split sysemu/runstate.h off sysemu/sysemu.h sysemu/sysemu.h is a rather unfocused dumping ground for stuff related to the system-emulator. Evidence: * It's included widely: in my "build everything" tree, changing sysemu/sysemu.h still triggers a recompile of some 1100 out of 6600 objects (not counting tests and objects that don't depend on qemu/osdep.h, down from 5400 due to the previous two commits). * It pulls in more than a dozen additional headers. ui/cocoa.m now needs to include "sysemu/runstate.h".