[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 39/43] sh4 hw/: Don't use CPUState
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH v5 39/43] sh4 hw/: Don't use CPUState |
Date: |
Wed, 14 Mar 2012 22:42:52 +0100 |
Scripted conversion:
for file in hw/sh.h hw/shix.c hw/r2d.c; do
sed -i "s/CPUState/CPUSH4State/g" $file
done
Signed-off-by: Andreas Färber <address@hidden>
Acked-by: Anthony Liguori <address@hidden>
---
hw/r2d.c | 6 +++---
hw/sh.h | 2 +-
hw/shix.c | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/hw/r2d.c b/hw/r2d.c
index ae327a7..c55de01 100644
--- a/hw/r2d.c
+++ b/hw/r2d.c
@@ -192,14 +192,14 @@ static qemu_irq *r2d_fpga_init(MemoryRegion *sysmem,
}
typedef struct ResetData {
- CPUState *env;
+ CPUSH4State *env;
uint32_t vector;
} ResetData;
static void main_cpu_reset(void *opaque)
{
ResetData *s = (ResetData *)opaque;
- CPUState *env = s->env;
+ CPUSH4State *env = s->env;
cpu_state_reset(env);
env->pc = s->vector;
@@ -224,7 +224,7 @@ static void r2d_init(ram_addr_t ram_size,
const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename, const char *cpu_model)
{
- CPUState *env;
+ CPUSH4State *env;
ResetData *reset_info;
struct SH7750State *s;
MemoryRegion *sdram = g_new(MemoryRegion, 1);
diff --git a/hw/sh.h b/hw/sh.h
index 6488db2..40df18c 100644
--- a/hw/sh.h
+++ b/hw/sh.h
@@ -11,7 +11,7 @@
struct SH7750State;
struct MemoryRegion;
-struct SH7750State *sh7750_init(CPUState * cpu, struct MemoryRegion *sysmem);
+struct SH7750State *sh7750_init(CPUSH4State * cpu, struct MemoryRegion
*sysmem);
typedef struct {
/* The callback will be triggered if any of the designated lines change */
diff --git a/hw/shix.c b/hw/shix.c
index e259c17..dd9ce17 100644
--- a/hw/shix.c
+++ b/hw/shix.c
@@ -43,7 +43,7 @@ static void shix_init(ram_addr_t ram_size,
const char *initrd_filename, const char *cpu_model)
{
int ret;
- CPUState *env;
+ CPUSH4State *env;
struct SH7750State *s;
MemoryRegion *sysmem = get_system_memory();
MemoryRegion *rom = g_new(MemoryRegion, 1);
--
1.7.7
- [Qemu-devel] [PATCH v5 21/43] target-s390x: Don't overuse CPUState, (continued)
- [Qemu-devel] [PATCH v5 21/43] target-s390x: Don't overuse CPUState, Andreas Färber, 2012/03/14
- [Qemu-devel] [PATCH v5 27/43] m68k-semi: Don't use CPUState, Andreas Färber, 2012/03/14
- [Qemu-devel] [PATCH v5 28/43] xtensa-semi: Don't use CPUState, Andreas Färber, 2012/03/14
- [Qemu-devel] [PATCH v5 29/43] alpha hw/: Don't use CPUState, Andreas Färber, 2012/03/14
- [Qemu-devel] [PATCH v5 07/43] target-unicore32: Rename to CPUUniCore32State, Andreas Färber, 2012/03/14
- [Qemu-devel] [PATCH v5 33/43] lm32 hw/: Don't use CPUState, Andreas Färber, 2012/03/14
- [Qemu-devel] [PATCH v5 08/43] hw/mc146818: Drop unneeded #includes, Andreas Färber, 2012/03/14
- [Qemu-devel] [PATCH v5 25/43] target-xtensa: Don't overuse CPUState, Andreas Färber, 2012/03/14
- [Qemu-devel] [PATCH v5 19/43] target-mips: Don't overuse CPUState, Andreas Färber, 2012/03/14
- [Qemu-devel] [PATCH v5 30/43] arm hw/: Don't use CPUState, Andreas Färber, 2012/03/14
- [Qemu-devel] [PATCH v5 39/43] sh4 hw/: Don't use CPUState,
Andreas Färber <=
- [Qemu-devel] [PATCH v5 35/43] microblaze hw/: Don't use CPUState, Andreas Färber, 2012/03/14
- [Qemu-devel] [PATCH v5 37/43] ppc hw/: Don't use CPUState, Andreas Färber, 2012/03/14
- [Qemu-devel] [PATCH v5 38/43] s390x hw/: Don't use CPUState, Andreas Färber, 2012/03/14
- [Qemu-devel] [PATCH v5 40/43] sparc hw/: Don't use CPUState, Andreas Färber, 2012/03/14
- [Qemu-devel] [PATCH v5 43/43] qom: Introduce CPU class, Andreas Färber, 2012/03/14
- [Qemu-devel] [PATCH v5 32/43] i386 hw/: Don't use CPUState, Andreas Färber, 2012/03/14
- [Qemu-devel] [PATCH v5 34/43] m68k hw/: Don't use CPUState, Andreas Färber, 2012/03/14
- [Qemu-devel] [PATCH v5 23/43] target-sparc: Don't overuse CPUState, Andreas Färber, 2012/03/14
- [Qemu-devel] [PATCH v5 36/43] mips hw/: Don't use CPUState, Andreas Färber, 2012/03/14
- [Qemu-devel] [PATCH v5 31/43] cris hw/: Don't use CPUState, Andreas Färber, 2012/03/14