[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 5/6] unicore32: Use uc32_cpu_init()
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 5/6] unicore32: Use uc32_cpu_init() |
Date: |
Tue, 10 Mar 2015 19:22:19 +0100 |
From: Eduardo Habkost <address@hidden>
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>
Signed-off-by: Andreas Färber <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.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 <=
- [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, 2015/03/10
- [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