On 7/10/20 2:28 PM, Peter Maydell wrote: > On Fri, 10 Jul 2020 at 13:14, Peter Maydell <peter.mayd...@linaro.org> wrote: >> >> On Wed, 8 Jul 2020 at 22:32, Paolo Bonzini <pbonz...@redhat.com> wrote: >>> >>> The following changes since commit eb2c66b10efd2b914b56b20ae90655914310c925: >>> >>> Merge remote-tracking branch >>> 'remotes/maxreitz/tags/pull-block-2020-07-06' into staging (2020-07-07 >>> 19:47:26 +0100) >>> >>> are available in the Git repository at: >>> >>> git://github.com/bonzini/qemu.git tags/for-upstream >>> >>> for you to fetch changes up to 392f34e59755f99d69586a63e0f5d80a7ef67f94: >>> >>> apic: Report current_count via 'info lapic' (2020-07-08 10:01:08 -0400) >> >> Hi; this still has the OSX failure, I'm afraid: >> >> /Users/pm215/src/qemu-for-merges/ui/cocoa.m:1478:9: error: implicit >> declaration of function 'cpu_throttle_set' is invalid in C99 [- >> Werror,-Wimplicit-function-declaration] >> cpu_throttle_set(throttle_pct); >> ^ >> /Users/pm215/src/qemu-for-merges/ui/cocoa.m:1478:9: error: this >> function declaration is not a prototype [-Werror,-Wstrict-prototypes] > > Squashing this into "cpu-throttle: new module, extracted from cpus.c" > should fix this (ui/cocoa.m was just forgotten when adding #include lines > after moving the function into its own header): > > diff --git a/ui/cocoa.m b/ui/cocoa.m > index cb556e4e66..0910b4a716 100644 > --- a/ui/cocoa.m > +++ b/ui/cocoa.m > @@ -32,6 +32,7 @@ > #include "ui/input.h" > #include "sysemu/sysemu.h" > #include "sysemu/runstate.h" > +#include "sysemu/cpu-throttle.h" > #include "qapi/error.h" > #include "qapi/qapi-commands-block.h" > #include "qapi/qapi-commands-misc.h" > > (am just doing a compile-and-test run with that change). > > thanks > -- PMM >
Ah, just noticed this, yes, indeed I clearly forgot that, at the same time clearly I need to improve both my local environment and the CI setups I am using, because for me everything works! Or, we could swap configurations so that QEMU builds are always successful... ;-) Ciao, Claudio
