lm32 hw/: Don't use CPUState
Scripted conversion: for file in hw/lm32_boards.c hw/milkymist.c; do sed -i "s/CPUState/CPULM32State/g" $file done Signed-off-by: Andreas Färber <afaerber@suse.de> Acked-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
parent
4a8fa5dca1
commit
93a674024c
@ -31,7 +31,7 @@
|
||||
#include "exec-memory.h"
|
||||
|
||||
typedef struct {
|
||||
CPUState *env;
|
||||
CPULM32State *env;
|
||||
target_phys_addr_t bootstrap_pc;
|
||||
target_phys_addr_t flash_base;
|
||||
target_phys_addr_t hwsetup_base;
|
||||
@ -42,7 +42,7 @@ typedef struct {
|
||||
|
||||
static void cpu_irq_handler(void *opaque, int irq, int level)
|
||||
{
|
||||
CPUState *env = opaque;
|
||||
CPULM32State *env = opaque;
|
||||
|
||||
if (level) {
|
||||
cpu_interrupt(env, CPU_INTERRUPT_HARD);
|
||||
@ -54,7 +54,7 @@ static void cpu_irq_handler(void *opaque, int irq, int level)
|
||||
static void main_cpu_reset(void *opaque)
|
||||
{
|
||||
ResetInfo *reset_info = opaque;
|
||||
CPUState *env = reset_info->env;
|
||||
CPULM32State *env = reset_info->env;
|
||||
|
||||
cpu_state_reset(env);
|
||||
|
||||
@ -75,7 +75,7 @@ static void lm32_evr_init(ram_addr_t ram_size_not_used,
|
||||
const char *kernel_cmdline,
|
||||
const char *initrd_filename, const char *cpu_model)
|
||||
{
|
||||
CPUState *env;
|
||||
CPULM32State *env;
|
||||
DriveInfo *dinfo;
|
||||
MemoryRegion *address_space_mem = get_system_memory();
|
||||
MemoryRegion *phys_ram = g_new(MemoryRegion, 1);
|
||||
@ -163,7 +163,7 @@ static void lm32_uclinux_init(ram_addr_t ram_size_not_used,
|
||||
const char *kernel_cmdline,
|
||||
const char *initrd_filename, const char *cpu_model)
|
||||
{
|
||||
CPUState *env;
|
||||
CPULM32State *env;
|
||||
DriveInfo *dinfo;
|
||||
MemoryRegion *address_space_mem = get_system_memory();
|
||||
MemoryRegion *phys_ram = g_new(MemoryRegion, 1);
|
||||
|
@ -37,7 +37,7 @@
|
||||
#define KERNEL_LOAD_ADDR 0x40000000
|
||||
|
||||
typedef struct {
|
||||
CPUState *env;
|
||||
CPULM32State *env;
|
||||
target_phys_addr_t bootstrap_pc;
|
||||
target_phys_addr_t flash_base;
|
||||
target_phys_addr_t initrd_base;
|
||||
@ -47,7 +47,7 @@ typedef struct {
|
||||
|
||||
static void cpu_irq_handler(void *opaque, int irq, int level)
|
||||
{
|
||||
CPUState *env = opaque;
|
||||
CPULM32State *env = opaque;
|
||||
|
||||
if (level) {
|
||||
cpu_interrupt(env, CPU_INTERRUPT_HARD);
|
||||
@ -59,7 +59,7 @@ static void cpu_irq_handler(void *opaque, int irq, int level)
|
||||
static void main_cpu_reset(void *opaque)
|
||||
{
|
||||
ResetInfo *reset_info = opaque;
|
||||
CPUState *env = reset_info->env;
|
||||
CPULM32State *env = reset_info->env;
|
||||
|
||||
cpu_state_reset(env);
|
||||
|
||||
@ -79,7 +79,7 @@ milkymist_init(ram_addr_t ram_size_not_used,
|
||||
const char *kernel_cmdline,
|
||||
const char *initrd_filename, const char *cpu_model)
|
||||
{
|
||||
CPUState *env;
|
||||
CPULM32State *env;
|
||||
int kernel_size;
|
||||
DriveInfo *dinfo;
|
||||
MemoryRegion *address_space_mem = get_system_memory();
|
||||
|
Loading…
Reference in New Issue
Block a user