diff options
| author | Andreas Färber <afaerber@suse.de> | 2012-05-04 02:36:04 +0200 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2012-06-04 23:00:45 +0200 |
| commit | c537d79cc523f6fa29f70a7055a93e2c128beb20 (patch) | |
| tree | f9168c4fa1d870db4aebbcbe6062fea33a082dbe /hw/leon3.c | |
| parent | 60ad07335697071ae8e183716171f59202c3c466 (diff) | |
| download | focaccia-qemu-c537d79cc523f6fa29f70a7055a93e2c128beb20.tar.gz focaccia-qemu-c537d79cc523f6fa29f70a7055a93e2c128beb20.zip | |
leon3: Store SPARCCPU in ResetData
Allows us to use cpu_reset() in place of cpu_state_reset() in main_cpu_reset(). Signed-off-by: Andreas Färber <afaerber@suse.de> Acked-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'hw/leon3.c')
| -rw-r--r-- | hw/leon3.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/hw/leon3.c b/hw/leon3.c index 8ffef83595..878d3aa557 100644 --- a/hw/leon3.c +++ b/hw/leon3.c @@ -42,16 +42,16 @@ #define MAX_PILS 16 typedef struct ResetData { - CPUSPARCState *env; + SPARCCPU *cpu; uint32_t entry; /* save kernel entry in case of reset */ } ResetData; static void main_cpu_reset(void *opaque) { ResetData *s = (ResetData *)opaque; - CPUSPARCState *env = s->env; + CPUSPARCState *env = &s->cpu->env; - cpu_state_reset(env); + cpu_reset(CPU(s->cpu)); env->halted = 0; env->pc = s->entry; @@ -129,7 +129,7 @@ static void leon3_generic_hw_init(ram_addr_t ram_size, /* Reset data */ reset_info = g_malloc0(sizeof(ResetData)); - reset_info->env = env; + reset_info->cpu = cpu; qemu_register_reset(main_cpu_reset, reset_info); /* Allocate IRQ manager */ |