[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 4/6] m68k: Use cpu_m68k_init()
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 4/6] m68k: Use cpu_m68k_init() |
Date: |
Tue, 10 Mar 2015 19:22:18 +0100 |
From: Eduardo Habkost <address@hidden>
Instead of using the legacy cpu_init() function, use cpu_m68k_init()
directly to create a M68kCPU object.
Signed-off-by: Eduardo Habkost <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
hw/m68k/dummy_m68k.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/hw/m68k/dummy_m68k.c b/hw/m68k/dummy_m68k.c
index facd561..278f4c0 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;
--
2.1.4
- [Qemu-devel] [PULL 0/6] QOM CPUState patch queue 2015-03-10, Andreas Färber, 2015/03/10
- [Qemu-devel] [PULL 1/6] cpu: Add missing documentation for some CPUClass methods, Andreas Färber, 2015/03/10
- [Qemu-devel] [PULL 5/6] unicore32: Use uc32_cpu_init(), Andreas Färber, 2015/03/10
- [Qemu-devel] [PULL 6/6] cpu: Make cpu_init() return QOM CPUState object, Andreas Färber, 2015/03/10
- [Qemu-devel] [PULL 4/6] m68k: Use cpu_m68k_init(),
Andreas Färber <=
- [Qemu-devel] [PULL 2/6] target-i386: Clean up misuse of qdev_init() in realize method, Andreas Färber, 2015/03/10
- [Qemu-devel] [PULL 3/6] target-unicore32: Make uc32_cpu_init() return UniCore32CPU, Andreas Färber, 2015/03/10
- Re: [Qemu-devel] [PULL 0/6] QOM CPUState patch queue 2015-03-10, Peter Maydell, 2015/03/11