From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49315) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aQrRk-00041s-Lm for qemu-devel@nongnu.org; Wed, 03 Feb 2016 02:01:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aQrRh-0008F7-Eb for qemu-devel@nongnu.org; Wed, 03 Feb 2016 02:01:48 -0500 Received: from mx1.redhat.com ([209.132.183.28]:34794) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aQrRh-0008Ex-9e for qemu-devel@nongnu.org; Wed, 03 Feb 2016 02:01:45 -0500 From: Markus Armbruster References: <1454439920-14661-1-git-send-email-eblake@redhat.com> <877fimanft.fsf@blackfin.pond.sub.org> <56B126E7.3090704@redhat.com> Date: Wed, 03 Feb 2016 08:01:41 +0100 In-Reply-To: <56B126E7.3090704@redhat.com> (Eric Blake's message of "Tue, 2 Feb 2016 15:00:07 -0700") Message-ID: <87y4b25lbe.fsf@blackfin.pond.sub.org> MIME-Version: 1.0 Content-Type: text/plain Subject: Re: [Qemu-devel] [PATCH] qapi: Fix compilation failure on sparc List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eric Blake Cc: Peter Maydell , Michael Roth , Peter Crosthwaite , qemu-devel@nongnu.org, Luiz Capitulino , Paolo Bonzini , Richard Henderson Eric Blake writes: > On 02/02/2016 01:04 PM, Markus Armbruster wrote: >> Eric Blake writes: >> >>> Commit 86f4b687 broke compilation on sparc, which has a preprocessor >>> pollution of '#define sparc 1'. Treat it the same way as we do for >>> the pollution with 'unix', so that QMP remains backwards compatible >>> and only the C code needs to use the alternative 'q_sparc' spelling. >>> >>> CC: Peter Maydell >>> Signed-off-by: Eric Blake >>> --- >>> >>> Done as a followup to the same style of patch for MIPS; or we could >>> squash this into one patch. >> >> Applied to qapi-next squashed: >> >> qapi: Fix compilation failure on MIPS and SPARC >> >> Commit 86f4b687 broke compilation on MIPS and SPARC, which have a >> preprocessor pollution of '#define mips 1' and '#define space 1', > > s/space/sparc/ > >> respectively. Treat it the same way as we do for the pollution with >> 'unix', so that QMP remains backwards compatible and only the C code >> needs to use the alternative 'q_mips' spelling. >> >> CC: James Hogan >> CC: Peter Maydell >> Signed-off-by: Eric Blake >> Tested-by: James Hogan >> Signed-off-by: Markus Armbruster >> Fixed up and pushed again. Thanks!