[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 16/20] ppc4xx_devs: Return PowerPCCPU from ppc4xx_in
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH 16/20] ppc4xx_devs: Return PowerPCCPU from ppc4xx_init() |
Date: |
Wed, 19 Dec 2012 14:36:32 +0100 |
Prepares for passing PowerPCCPU to ppc_booke_timers_init().
Signed-off-by: Andreas Färber <address@hidden>
---
hw/ppc405_uc.c | 8 ++++++--
hw/ppc4xx.h | 6 +++---
hw/ppc4xx_devs.c | 8 ++++----
3 Dateien geändert, 13 Zeilen hinzugefügt(+), 9 Zeilen entfernt(-)
diff --git a/hw/ppc405_uc.c b/hw/ppc405_uc.c
index 0f458ef..373b8f3 100644
--- a/hw/ppc405_uc.c
+++ b/hw/ppc405_uc.c
@@ -2111,12 +2111,14 @@ CPUPPCState *ppc405cr_init(MemoryRegion
*address_space_mem,
{
clk_setup_t clk_setup[PPC405CR_CLK_NB];
qemu_irq dma_irqs[4];
+ PowerPCCPU *cpu;
CPUPPCState *env;
qemu_irq *pic, *irqs;
memset(clk_setup, 0, sizeof(clk_setup));
- env = ppc4xx_init("405cr", &clk_setup[PPC405CR_CPU_CLK],
+ cpu = ppc4xx_init("405cr", &clk_setup[PPC405CR_CPU_CLK],
&clk_setup[PPC405CR_TMR_CLK], sysclk);
+ env = &cpu->env;
/* Memory mapped devices registers */
/* PLB arbitrer */
ppc4xx_plb_init(env);
@@ -2460,13 +2462,15 @@ CPUPPCState *ppc405ep_init(MemoryRegion
*address_space_mem,
{
clk_setup_t clk_setup[PPC405EP_CLK_NB], tlb_clk_setup;
qemu_irq dma_irqs[4], gpt_irqs[5], mal_irqs[4];
+ PowerPCCPU *cpu;
CPUPPCState *env;
qemu_irq *pic, *irqs;
memset(clk_setup, 0, sizeof(clk_setup));
/* init CPUs */
- env = ppc4xx_init("405ep", &clk_setup[PPC405EP_CPU_CLK],
+ cpu = ppc4xx_init("405ep", &clk_setup[PPC405EP_CPU_CLK],
&tlb_clk_setup, sysclk);
+ env = &cpu->env;
clk_setup[PPC405EP_CPU_CLK].cb = tlb_clk_setup.cb;
clk_setup[PPC405EP_CPU_CLK].opaque = tlb_clk_setup.opaque;
/* Internal devices init */
diff --git a/hw/ppc4xx.h b/hw/ppc4xx.h
index d795ced..5d891ae 100644
--- a/hw/ppc4xx.h
+++ b/hw/ppc4xx.h
@@ -28,9 +28,9 @@
#include "pci.h"
/* PowerPC 4xx core initialization */
-CPUPPCState *ppc4xx_init (const char *cpu_model,
- clk_setup_t *cpu_clk, clk_setup_t *tb_clk,
- uint32_t sysclk);
+PowerPCCPU *ppc4xx_init(const char *cpu_model,
+ clk_setup_t *cpu_clk, clk_setup_t *tb_clk,
+ uint32_t sysclk);
/* PowerPC 4xx universal interrupt controller */
enum {
diff --git a/hw/ppc4xx_devs.c b/hw/ppc4xx_devs.c
index bac8d87..761cb59 100644
--- a/hw/ppc4xx_devs.c
+++ b/hw/ppc4xx_devs.c
@@ -47,9 +47,9 @@ static void ppc4xx_reset(void *opaque)
/*****************************************************************************/
/* Generic PowerPC 4xx processor instantiation */
-CPUPPCState *ppc4xx_init (const char *cpu_model,
- clk_setup_t *cpu_clk, clk_setup_t *tb_clk,
- uint32_t sysclk)
+PowerPCCPU *ppc4xx_init(const char *cpu_model,
+ clk_setup_t *cpu_clk, clk_setup_t *tb_clk,
+ uint32_t sysclk)
{
PowerPCCPU *cpu;
CPUPPCState *env;
@@ -72,7 +72,7 @@ CPUPPCState *ppc4xx_init (const char *cpu_model,
/* Register qemu callbacks */
qemu_register_reset(ppc4xx_reset, cpu);
- return env;
+ return cpu;
}
/*****************************************************************************/
--
1.7.10.4
- [Qemu-devel] [PATCH 02/20] alpha: Pass AlphaCPU array to Typhoon, (continued)
- [Qemu-devel] [PATCH 02/20] alpha: Pass AlphaCPU array to Typhoon, Andreas Färber, 2012/12/19
- [Qemu-devel] [PATCH 03/20] target-alpha: Avoid leaking the alarm timer over reset, Andreas Färber, 2012/12/19
- [Qemu-devel] [PATCH 06/20] cpu: Introduce CPUListState struct, Andreas Färber, 2012/12/19
- [Qemu-devel] [PATCH 05/20] target-alpha: Add support for -cpu ?, Andreas Färber, 2012/12/19
- [Qemu-devel] [PATCH 09/20] cpu: Move kvm_fd into CPUState, Andreas Färber, 2012/12/19
- [Qemu-devel] [PATCH 01/20] target-alpha: Let cpu_alpha_init() return AlphaCPU, Andreas Färber, 2012/12/19
- [Qemu-devel] [PATCH 04/20] target-alpha: Turn CPU definitions into subclasses, Andreas Färber, 2012/12/19
- [Qemu-devel] [PATCH 13/20] ppc: Pass PowerPCCPU to [h]decr callbacks, Andreas Färber, 2012/12/19
- [Qemu-devel] [PATCH 15/20] ppc_booke: Pass PowerPCCPU to {decr, fit, wdt} timer callbacks, Andreas Färber, 2012/12/19
- [Qemu-devel] [PATCH 07/20] qdev: Coding style fixes, Andreas Färber, 2012/12/19
- [Qemu-devel] [PATCH 16/20] ppc4xx_devs: Return PowerPCCPU from ppc4xx_init(),
Andreas Färber <=
- [Qemu-devel] [PATCH 10/20] kvm: Pass CPUState to kvm_arch_*, Andreas Färber, 2012/12/19
- [Qemu-devel] [PATCH 12/20] ppc: Pass PowerPCCPU to ppc_set_irq(), Andreas Färber, 2012/12/19
- [Qemu-devel] [PATCH 14/20] ppc: Pass PowerPCCPU to [h]decr timer callbacks, Andreas Färber, 2012/12/19
- [Qemu-devel] [PATCH 11/20] kvm: Pass CPUState to kvm_vcpu_ioctl(), Andreas Färber, 2012/12/19
- [Qemu-devel] [PATCH 08/20] qdev-properties.c: Separate core from the code used only by qemu-system-*, Andreas Färber, 2012/12/19
- [Qemu-devel] [PATCH 20/20] MAINTAINERS: Include X86CPU in CPU maintenance area, Andreas Färber, 2012/12/19
- [Qemu-devel] [PATCH 18/20] cpu: Move kvm_state field into CPUState, Andreas Färber, 2012/12/19
- [Qemu-devel] [PATCH 19/20] cpu: Move kvm_run into CPUState, Andreas Färber, 2012/12/19
- [Qemu-devel] [PATCH 17/20] ppc_booke: Pass PowerPCCPU to ppc_booke_timers_init(), Andreas Färber, 2012/12/19
- Re: [Qemu-devel] [PULL] QOM CPUState patch queue 2012-12-19, Blue Swirl, 2012/12/22