[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-next 71/74] mips_r4k: Store MIPSCPU in ResetData
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH for-next 71/74] mips_r4k: Store MIPSCPU in ResetData |
Date: |
Sun, 6 May 2012 17:35:11 +0200 |
Allows us to use cpu_reset() in place of cpu_state_reset() in
main_cpu_reset().
Signed-off-by: Andreas Färber <address@hidden>
---
hw/mips_r4k.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/mips_r4k.c b/hw/mips_r4k.c
index f89957c..d685999 100644
--- a/hw/mips_r4k.c
+++ b/hw/mips_r4k.c
@@ -65,7 +65,7 @@ static const MemoryRegionOps mips_qemu_ops = {
};
typedef struct ResetData {
- CPUMIPSState *env;
+ MIPSCPU *cpu;
uint64_t vector;
} ResetData;
@@ -143,9 +143,9 @@ static int64_t load_kernel(void)
static void main_cpu_reset(void *opaque)
{
ResetData *s = (ResetData *)opaque;
- CPUMIPSState *env = s->env;
+ CPUMIPSState *env = &s->cpu->env;
- cpu_state_reset(env);
+ cpu_reset(CPU(s->cpu));
env->active_tc.PC = s->vector;
}
@@ -188,7 +188,7 @@ void mips_r4k_init (ram_addr_t ram_size,
env = &cpu->env;
reset_info = g_malloc0(sizeof(ResetData));
- reset_info->env = env;
+ reset_info->cpu = cpu;
reset_info->vector = env->active_tc.PC;
qemu_register_reset(main_cpu_reset, reset_info);
--
1.7.7
- [Qemu-devel] [PATCH for-next 62/74] mips_fulong2e: Use cpu_mips_cpu() to obtain MIPSCPU, (continued)
- [Qemu-devel] [PATCH for-next 62/74] mips_fulong2e: Use cpu_mips_cpu() to obtain MIPSCPU, Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 61/74] target-mips: Let cpu_mips_init() return MIPSCPU, Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 54/74] cris-boot: Pass CRISCPU to cris_load_image(), Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 49/74] xtensa_lx60: Use cpu_xtensa_init() to obtain XtensaCPU, Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 66/74] mips_malta: Use cpu_mips_init() to obtain MIPSCPU, Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 59/74] microblaze_boot: Pass MicroBlazeCPU to microblaze_load_kernel(), Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 65/74] mips_jazz: Pass MIPSCPU to main_cpu_reset(), Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 67/74] mips_malta: Pass MIPSCPU to main_cpu_reset(), Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 68/74] mips_mipssim: Use cpu_mips_init() to obtain MIPSCPU, Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 71/74] mips_r4k: Store MIPSCPU in ResetData,
Andreas Färber <=
- [Qemu-devel] [PATCH for-next 58/74] petalogix_s3adsp1800_mmu: Use cpu_mb_init() to obtain MicroBlazeCPU, Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 69/74] mips_mipssim: Store MIPSCPU in ResetData, Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 64/74] mips_jazz: Use cpu_mips_init() to obtain MIPSCPU, Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 72/74] bsd-user: Use cpu_reset() in after cpu_init(), Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 73/74] linux-user: Use cpu_reset() after cpu_init() / cpu_copy(), Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 63/74] mips_fulong2e: Pass MIPSCPU to main_cpu_reset(), Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 74/74] Kill off cpu_state_reset(), Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 70/74] mips_r4k: Use cpu_mips_init() to obtain MIPSCPU, Andreas Färber, 2012/05/06