[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-next 63/74] mips_fulong2e: Pass MIPSCPU to main_
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH for-next 63/74] mips_fulong2e: Pass MIPSCPU to main_cpu_reset() |
Date: |
Sun, 6 May 2012 17:35:03 +0200 |
Allows us to use cpu_reset() in place of cpu_state_reset().
Signed-off-by: Andreas Färber <address@hidden>
---
hw/mips_fulong2e.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/hw/mips_fulong2e.c b/hw/mips_fulong2e.c
index 8b66e7b..9a12a76 100644
--- a/hw/mips_fulong2e.c
+++ b/hw/mips_fulong2e.c
@@ -198,9 +198,10 @@ static void write_bootloader (CPUMIPSState *env, uint8_t
*base, int64_t kernel_a
static void main_cpu_reset(void *opaque)
{
- CPUMIPSState *env = opaque;
+ MIPSCPU *cpu = opaque;
+ CPUMIPSState *env = &cpu->env;
- cpu_state_reset(env);
+ cpu_reset(CPU(cpu));
/* TODO: 2E reset stuff */
if (loaderparams.kernel_filename) {
env->CP0_Status &= ~((1 << CP0St_BEV) | (1 << CP0St_ERL));
@@ -287,7 +288,7 @@ static void mips_fulong2e_init(ram_addr_t ram_size, const
char *boot_device,
env = &cpu->env;
register_savevm(NULL, "cpu", 0, 3, cpu_save, cpu_load, env);
- qemu_register_reset(main_cpu_reset, env);
+ qemu_register_reset(main_cpu_reset, cpu);
/* fulong 2e has 256M ram. */
ram_size = 256 * 1024 * 1024;
--
1.7.7
- Re: [Qemu-devel] [PATCH for-next 65/74] mips_jazz: Pass MIPSCPU to main_cpu_reset(), (continued)
- [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, 2012/05/06
- [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 <=
- [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