From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60645) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aQcJ7-0005wC-11 for qemu-devel@nongnu.org; Tue, 02 Feb 2016 09:51:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aQcJ2-0004XO-TA for qemu-devel@nongnu.org; Tue, 02 Feb 2016 09:51:52 -0500 Received: from resqmta-po-07v.sys.comcast.net ([96.114.154.166]:39024) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aQcJ2-0004X8-Nd for qemu-devel@nongnu.org; Tue, 02 Feb 2016 09:51:48 -0500 From: Eric Blake Date: Tue, 2 Feb 2016 07:51:41 -0700 Message-Id: <1454424701-26111-1-git-send-email-eblake@redhat.com> Subject: [Qemu-devel] [PATCH] qapi: Fix compilation failure on MIPS List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: James Hogan , Michael Roth , Peter Crosthwaite , armbru@redhat.com, Luiz Capitulino , Paolo Bonzini , Richard Henderson Commit 86f4b687 broke compilation on MIPS, which has a preprocessor pollution of '#define mips 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_mips' spelling. CC: James Hogan Signed-off-by: Eric Blake --- scripts/qapi.py | 2 +- cpus.c | 4 ++-- hmp.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/qapi.py b/scripts/qapi.py index d199222..7f114c4 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']) + polluted_words = set(['unix', 'errno', 'mips']) 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 882b618..c8a2317 100644 --- a/cpus.c +++ b/cpus.c @@ -1581,8 +1581,8 @@ CpuInfoList *qmp_query_cpus(Error **errp) info->value->u.sparc->npc = env->npc; #elif defined(TARGET_MIPS) info->value->arch = CPU_INFO_ARCH_MIPS; - info->value->u.mips = g_new0(CpuInfoMIPS, 1); - info->value->u.mips->PC = env->active_tc.PC; + info->value->u.q_mips = g_new0(CpuInfoMIPS, 1); + info->value->u.q_mips->PC = env->active_tc.PC; #elif defined(TARGET_TRICORE) info->value->arch = CPU_INFO_ARCH_TRICORE; info->value->u.tricore = g_new0(CpuInfoTricore, 1); diff --git a/hmp.c b/hmp.c index a4b74df..ef98344 100644 --- a/hmp.c +++ b/hmp.c @@ -322,7 +322,7 @@ void hmp_info_cpus(Monitor *mon, const QDict *qdict) monitor_printf(mon, " npc=0x%016" PRIx64, cpu->value->u.sparc->npc); break; case CPU_INFO_ARCH_MIPS: - monitor_printf(mon, " PC=0x%016" PRIx64, cpu->value->u.mips->PC); + monitor_printf(mon, " PC=0x%016" PRIx64, cpu->value->u.q_mips->PC); break; case CPU_INFO_ARCH_TRICORE: monitor_printf(mon, " PC=0x%016" PRIx64, cpu->value->u.tricore->PC); -- 2.5.0