From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46502) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VtpcX-0006ml-Ho for qemu-devel@nongnu.org; Thu, 19 Dec 2013 21:15:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VtpcO-0001c3-DP for qemu-devel@nongnu.org; Thu, 19 Dec 2013 21:15:21 -0500 Received: from e23smtp03.au.ibm.com ([202.81.31.145]:34643) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VtpcN-0001aR-Mi for qemu-devel@nongnu.org; Thu, 19 Dec 2013 21:15:12 -0500 Received: from /spool/local by e23smtp03.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 20 Dec 2013 12:15:04 +1000 From: Alexey Kardashevskiy Date: Fri, 20 Dec 2013 13:14:57 +1100 Message-Id: <1387505697-19270-1-git-send-email-aik@ozlabs.ru> Subject: [Qemu-devel] [PATCH] target-ppc: fix compile error when PPC_DUMP_CPU is enabled List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Alexey Kardashevskiy , qemu-ppc@nongnu.org, Alexander Graf Since last use of PPC_DUMP_CPU by whoever he/she was, env->tlb became a union and POWERPC CPU class got QOM'ed so defining PPC_DUMP_CPU breaks compile. This fixes compiler errors. Signed-off-by: Alexey Kardashevskiy --- target-ppc/translate_init.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index c030a20..5f59746 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -8138,9 +8138,10 @@ static void ppc_cpu_realizefn(DeviceState *dev, Error **errp) } printf("PowerPC %-12s : PVR %08x MSR %016" PRIx64 "\n" " MMU model : %s\n", - pcc->name, pcc->pvr, pcc->msr_mask, mmu_model); + object_class_get_name(OBJECT_CLASS(pcc)), + pcc->pvr, pcc->msr_mask, mmu_model); #if !defined(CONFIG_USER_ONLY) - if (env->tlb != NULL) { + if (env->tlb.tlb6) { printf(" %d %s TLB in %d ways\n", env->nb_tlb, env->id_tlbs ? "splitted" : "merged", env->nb_ways); -- 1.8.4.rc4