From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36887) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1alful-0001tu-G1 for qemu-devel@nongnu.org; Thu, 31 Mar 2016 12:57:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1alfui-0007cQ-7f for qemu-devel@nongnu.org; Thu, 31 Mar 2016 12:57:47 -0400 Received: from ignoranthack.me ([199.102.79.106]:52984 helo=mail.ignoranthack.me) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1alfui-0007SJ-2p for qemu-devel@nongnu.org; Thu, 31 Mar 2016 12:57:44 -0400 From: Sean Bruno References: <56EEF805.8040008@freebsd.org> <87vb4grya5.fsf@linaro.org> <56F00ABC.9030700@freebsd.org> <87oaa7sv02.fsf@linaro.org> <56F019B9.4080803@redhat.com> <56F16E8B.8030105@freebsd.org> <878u1ascsr.fsf@linaro.org> Message-ID: <56FD56EE.3040600@freebsd.org> Date: Thu, 31 Mar 2016 09:57:18 -0700 MIME-Version: 1.0 In-Reply-To: <878u1ascsr.fsf@linaro.org> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [FreeBSD] Host build i386 failing to build aarch64 targets List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?UTF-8?Q?Alex_Benn=c3=a9e?= Cc: Paolo Bonzini , QEMU Developers , Peter Maydell -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 This seems to at least allow things to compile, qemu-system seems to be able to boot images on i386, but I may have missed something: diff --git a/cpus.c b/cpus.c index 23cf7aa..11f8bab 100644 - --- a/cpus.c +++ b/cpus.c @@ -338,15 +338,8 @@ static int64_t qemu_icount_round(int64_t count) static void icount_warp_rt(void) { - - /* The icount_warp_timer is rescheduled soon after vm_clock_warp_start - - * changes from -1 to another value, so the race here is okay. - - */ - - if (atomic_read(&vm_clock_warp_start) == -1) { - - return; - - } - - seqlock_write_lock(&timers_state.vm_clock_seqlock); - - if (runstate_is_running()) { + if ((vm_clock_warp_start != -1) && runstate_is_running()) { int64_t clock = REPLAY_CLOCK(REPLAY_CLOCK_VIRTUAL_RT, cpu_get_clock_locked()); int64_t warp_delta; -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQF8BAEBCgBmBQJW/VbrXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRCQUFENDYzMkU3MTIxREU4RDIwOTk3REQx MjAxRUZDQTFFNzI3RTY0AAoJEBIB78oecn5k4PUH/0PP+LzCDZmHCUN0ZuQ6Z6SK VWevvfg6d7mgqcobGD94E8V5AZYO9y4aj+WerCPULXq7I2qAthgqlccUaPMN4KKz +cJiBo02pzOXJmbPLiFetsQj87+nUzUpcJ2yVY0eiFcO2lbNQV20UZdYDuacQ0ds bjyhq49dC51wsn6ET1FMY6BH8vmdicWe4SMDEgSw32pFvZmIlGKFwuP3w+2dLpYg H4aajemN2PrHggcsRI8Gxu2G6yPbuWuGB6eaqS/OQ+6NxUmXz2lqOgzMfBAZjlzQ 5kVp8XRcU42koS2hLPmmxyxZ98W54oM8LtrUYdoecTabvJG3cwaApw7OITWZJPM= =Hpp4 -----END PGP SIGNATURE-----