[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/4] unicore32: Use uc32_cpu_init()
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PATCH 3/4] unicore32: Use uc32_cpu_init() |
Date: |
Thu, 26 Feb 2015 17:37:48 -0300 |
Instead of using the legacy cpu_init() function, use uc32_cpu_init() to
create a UniCore32CPU object.
Signed-off-by: Eduardo Habkost <address@hidden>
Cc: Guan Xuetao <address@hidden>
---
hw/unicore32/puv3.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/hw/unicore32/puv3.c b/hw/unicore32/puv3.c
index c41499e..cc9a21a 100644
--- a/hw/unicore32/puv3.c
+++ b/hw/unicore32/puv3.c
@@ -109,6 +109,7 @@ static void puv3_init(MachineState *machine)
const char *kernel_filename = machine->kernel_filename;
const char *initrd_filename = machine->initrd_filename;
CPUUniCore32State *env;
+ UniCore32CPU *cpu;
if (initrd_filename) {
hw_error("Please use kernel built-in initramdisk.\n");
@@ -118,10 +119,11 @@ static void puv3_init(MachineState *machine)
cpu_model = "UniCore-II";
}
- env = cpu_init(cpu_model);
- if (!env) {
+ cpu = uc32_cpu_init(cpu_model);
+ if (!cpu) {
hw_error("Unable to find CPU definition\n");
}
+ env = &cpu->env;
puv3_soc_init(env);
puv3_board_init(env, ram_size);
--
2.1.0