diff options
| author | Eduardo Habkost <ehabkost@redhat.com> | 2015-02-26 17:37:47 -0300 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2015-03-10 17:07:28 +0100 |
| commit | eeff620f820f9f0a4f400dec1437bc251402051a (patch) | |
| tree | 3524c9650e02f386f8f9f13d90c6d0539328501b /hw/m68k | |
| parent | 41979669ab756791cebc1a20c6a6ee1cb7c71caa (diff) | |
m68k: Use cpu_m68k_init()
Instead of using the legacy cpu_init() function, use cpu_m68k_init()
directly to create a M68kCPU object.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'hw/m68k')
| -rw-r--r-- | hw/m68k/dummy_m68k.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/hw/m68k/dummy_m68k.c b/hw/m68k/dummy_m68k.c index facd561efa..278f4c03d3 100644 --- a/hw/m68k/dummy_m68k.c +++ b/hw/m68k/dummy_m68k.c @@ -21,6 +21,7 @@ static void dummy_m68k_init(MachineState *machine) ram_addr_t ram_size = machine->ram_size; const char *cpu_model = machine->cpu_model; const char *kernel_filename = machine->kernel_filename; + M68kCPU *cpu; CPUM68KState *env; MemoryRegion *address_space_mem = get_system_memory(); MemoryRegion *ram = g_new(MemoryRegion, 1); @@ -30,11 +31,12 @@ static void dummy_m68k_init(MachineState *machine) if (!cpu_model) cpu_model = "cfv4e"; - env = cpu_init(cpu_model); - if (!env) { + cpu = cpu_m68k_init(cpu_model); + if (!cpu) { fprintf(stderr, "Unable to find m68k CPU definition\n"); exit(1); } + env = &cpu->env; /* Initialize CPU registers. */ env->vbr = 0; |