* [Qemu-devel] [PATCH] target-ppc: fix compile error when PPC_DUMP_CPU is enabled
@ 2013-12-20 2:14 Alexey Kardashevskiy
2013-12-20 2:19 ` Alexander Graf
0 siblings, 1 reply; 2+ messages in thread
From: Alexey Kardashevskiy @ 2013-12-20 2:14 UTC (permalink / raw)
To: qemu-devel; +Cc: Alexey Kardashevskiy, qemu-ppc, 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 <aik@ozlabs.ru>
---
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Qemu-devel] [PATCH] target-ppc: fix compile error when PPC_DUMP_CPU is enabled
2013-12-20 2:14 [Qemu-devel] [PATCH] target-ppc: fix compile error when PPC_DUMP_CPU is enabled Alexey Kardashevskiy
@ 2013-12-20 2:19 ` Alexander Graf
0 siblings, 0 replies; 2+ messages in thread
From: Alexander Graf @ 2013-12-20 2:19 UTC (permalink / raw)
To: Alexey Kardashevskiy; +Cc: qemu-ppc, QEMU Developers
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-12-20 2:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-20 2:14 [Qemu-devel] [PATCH] target-ppc: fix compile error when PPC_DUMP_CPU is enabled Alexey Kardashevskiy
2013-12-20 2:19 ` Alexander Graf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).