diff mbox

target-ppc: fix compile error when PPC_DUMP_CPU is enabled

Message ID 1387505697-19270-1-git-send-email-aik@ozlabs.ru
State New
Headers show

Commit Message

Alexey Kardashevskiy Dec. 20, 2013, 2:14 a.m. UTC 
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 <aik@ozlabs.ru>
---
 target-ppc/translate_init.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

Alexander Graf Dec. 20, 2013, 2:19 a.m. UTC | #1 
On 20.12.2013, at 03:14, Alexey Kardashevskiy <aik@ozlabs.ru> wrote:

> 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 <aik@ozlabs.ru>

Thanks, applied to ppc-next.


Alex
diff mbox

Patch

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);