Commit 7927df3a authored by Andreas Färber's avatar Andreas Färber
Browse files

m68k hw/: Don't use CPUState 



Scripted conversion:
  for file in hw/an5206.c hw/dummy_m68k.c hw/mcf.h hw/mcf5206.c hw/mcf5208.c hw/mcf_intc.c; do
    sed -i "s/CPUState/CPUM68KState/g" $file
  done

Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
Acked-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent 93a67402

hw/an5206.c

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ static void an5206_init(ram_addr_t ram_size, 
                     const char *kernel_filename, const char *kernel_cmdline,

                     const char *initrd_filename, const char *cpu_model)

{

    CPUState *env;

    CPUM68KState *env;

    int kernel_size;

    uint64_t elf_entry;

    target_phys_addr_t entry;

hw/dummy_m68k.c

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ static void dummy_m68k_init(ram_addr_t ram_size, 
                     const char *kernel_filename, const char *kernel_cmdline,

                     const char *initrd_filename, const char *cpu_model)

{

    CPUState *env;

    CPUM68KState *env;

    MemoryRegion *address_space_mem =  get_system_memory();

    MemoryRegion *ram = g_new(MemoryRegion, 1);

    int kernel_size;

hw/mcf.h

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ void mcf_uart_mm_init(struct MemoryRegion *sysmem, 
/* mcf_intc.c */

qemu_irq *mcf_intc_init(struct MemoryRegion *sysmem,

                        target_phys_addr_t base,

                        CPUState *env);

                        CPUM68KState *env);



/* mcf_fec.c */

void mcf_fec_init(struct MemoryRegion *sysmem, NICInfo *nd,
@@ -25,6 +25,6 @@ void mcf_fec_init(struct MemoryRegion *sysmem, NICInfo *nd, 


/* mcf5206.c */

qemu_irq *mcf5206_init(struct MemoryRegion *sysmem,

                       uint32_t base, CPUState *env);

                       uint32_t base, CPUM68KState *env);



#endif

hw/mcf5206.c

+2 −2
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ static m5206_timer_state *m5206_timer_init(qemu_irq irq) 
/* System Integration Module.  */



typedef struct {

    CPUState *env;

    CPUM68KState *env;

    MemoryRegion iomem;

    m5206_timer_state *timer[2];

    void *uart[2];
@@ -525,7 +525,7 @@ static const MemoryRegionOps m5206_mbar_ops = { 
    .endianness = DEVICE_NATIVE_ENDIAN,

};



qemu_irq *mcf5206_init(MemoryRegion *sysmem, uint32_t base, CPUState *env)

qemu_irq *mcf5206_init(MemoryRegion *sysmem, uint32_t base, CPUM68KState *env)

{

    m5206_mbar_state *s;

    qemu_irq *pic;

hw/mcf5208.c

+1 −1
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ static void mcf5208evb_init(ram_addr_t ram_size, 
                     const char *kernel_filename, const char *kernel_cmdline,

                     const char *initrd_filename, const char *cpu_model)

{

    CPUState *env;

    CPUM68KState *env;

    int kernel_size;

    uint64_t elf_entry;

    target_phys_addr_t entry;