From patchwork Tue Feb 2 19:05:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Blake X-Patchwork-Id: 8194591 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 4B716BEEE5 for ; Tue, 2 Feb 2016 19:05:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 946F3201C7 for ; Tue, 2 Feb 2016 19:05:42 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CBF3820172 for ; Tue, 2 Feb 2016 19:05:41 +0000 (UTC) Received: from localhost ([::1]:59034 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aQgGi-0004KJ-RU for patchwork-qemu-devel@patchwork.kernel.org; Tue, 02 Feb 2016 14:05:40 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49514) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aQgGb-0004KB-LY for qemu-devel@nongnu.org; Tue, 02 Feb 2016 14:05:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aQgGY-0004gU-DR for qemu-devel@nongnu.org; Tue, 02 Feb 2016 14:05:33 -0500 Received: from resqmta-po-02v.sys.comcast.net ([96.114.154.161]:60360) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aQgGY-0004gQ-7F for qemu-devel@nongnu.org; Tue, 02 Feb 2016 14:05:30 -0500 Received: from resomta-po-01v.sys.comcast.net ([96.114.154.225]) by resqmta-po-02v.sys.comcast.net with comcast id DX4c1s0084s37d401X5UXw; Tue, 02 Feb 2016 19:05:28 +0000 Received: from red.redhat.com ([24.10.254.122]) by resomta-po-01v.sys.comcast.net with comcast id DX5Q1s00F2fD5rL01X5T5V; Tue, 02 Feb 2016 19:05:28 +0000 From: Eric Blake To: qemu-devel@nongnu.org Date: Tue, 2 Feb 2016 12:05:20 -0700 Message-Id: <1454439920-14661-1-git-send-email-eblake@redhat.com> X-Mailer: git-send-email 2.5.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net; s=q20140121; t=1454439928; bh=p+arvbQun3n2ery4yTH97FkfgXdOhGQ/IxuPgQI02A0=; h=Received:Received:From:To:Subject:Date:Message-Id; b=m5XLwwRuf7Rz3ZjUi/0I8Gx7h7fg5qVabLs85I9ZgRwv9OxXatSVG0n5H9p1ZCFOX jVZjAt7gBZo0j2Ct+E/5tvR/gqWIMtFqfDlO5Q8h+x96VC4nEt3HADEaQPq2G6ANEx yVz1bMoA3uv+ITJXF2RPSvTKlCGlAvSl+ljduzPkC2l8cXRw8QU9d0wA++2WMLRSun oycbaO0IWqvrOgDNfWkDzd+tkPRWEpmiNZWynui00gR7SejnjpckfNs2h6136GQupm 19W5VY7WFy1H7chnei3zT58Xov8qVcqmVnXdn+CCaBWAzvqkm6L6bXGklnvBiEccIG 6MriBD/JTXcLQ== X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 96.114.154.161 Cc: Peter Maydell , Michael Roth , Peter Crosthwaite , armbru@redhat.com, Luiz Capitulino , Paolo Bonzini , Richard Henderson Subject: [Qemu-devel] [PATCH] qapi: Fix compilation failure on sparc X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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. scripts/qapi.py | 2 +- cpus.c | 6 +++--- hmp.c | 6 ++++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/scripts/qapi.py b/scripts/qapi.py index 7f114c4..965b157 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -1482,7 +1482,7 @@ def c_name(name, protect=True): 'and', 'and_eq', 'bitand', 'bitor', 'compl', 'not', 'not_eq', 'or', 'or_eq', 'xor', 'xor_eq']) # namespace pollution: - polluted_words = set(['unix', 'errno', 'mips']) + polluted_words = set(['unix', 'errno', 'mips', 'sparc']) name = name.translate(c_name_trans) if protect and (name in c89_words | c99_words | c11_words | gcc_words | cpp_words | polluted_words): diff --git a/cpus.c b/cpus.c index c8a2317..898426c 100644 --- a/cpus.c +++ b/cpus.c @@ -1576,9 +1576,9 @@ CpuInfoList *qmp_query_cpus(Error **errp) info->value->u.ppc->nip = env->nip; #elif defined(TARGET_SPARC) info->value->arch = CPU_INFO_ARCH_SPARC; - info->value->u.sparc = g_new0(CpuInfoSPARC, 1); - info->value->u.sparc->pc = env->pc; - info->value->u.sparc->npc = env->npc; + info->value->u.q_sparc = g_new0(CpuInfoSPARC, 1); + info->value->u.q_sparc->pc = env->pc; + info->value->u.q_sparc->npc = env->npc; #elif defined(TARGET_MIPS) info->value->arch = CPU_INFO_ARCH_MIPS; info->value->u.q_mips = g_new0(CpuInfoMIPS, 1); diff --git a/hmp.c b/hmp.c index ef98344..cbf6d61 100644 --- a/hmp.c +++ b/hmp.c @@ -318,8 +318,10 @@ void hmp_info_cpus(Monitor *mon, const QDict *qdict) monitor_printf(mon, " nip=0x%016" PRIx64, cpu->value->u.ppc->nip); break; case CPU_INFO_ARCH_SPARC: - monitor_printf(mon, " pc=0x%016" PRIx64, cpu->value->u.sparc->pc); - monitor_printf(mon, " npc=0x%016" PRIx64, cpu->value->u.sparc->npc); + monitor_printf(mon, " pc=0x%016" PRIx64, + cpu->value->u.q_sparc->pc); + monitor_printf(mon, " npc=0x%016" PRIx64, + cpu->value->u.q_sparc->npc); break; case CPU_INFO_ARCH_MIPS: monitor_printf(mon, " PC=0x%016" PRIx64, cpu->value->u.q_mips->PC);