From: Jerone Young <[EMAIL PROTECTED]>
This patch renames pp440_init to ppc440ep_init, as ppc440 is the name of
the core and ppc440ep is the name of the SOC. When we init we are
initializing the SOC.
Also in this patch we now call cpu_ppc_init for bamboo with string 440 ..
as 440 is the core.
Signed-off-by: Jerone Young <[EMAIL PROTECTED]>
Signed-off-by: Avi Kivity <[EMAIL PROTECTED]>
diff --git a/qemu/hw/ppc440.c b/qemu/hw/ppc440.c
index a9580ce..5bb105d 100644
--- a/qemu/hw/ppc440.c
+++ b/qemu/hw/ppc440.c
@@ -10,7 +10,7 @@
#include "ppc440.h"
-void ppc440_init(CPUState *env,
+void ppc440ep_init(CPUState *env,
target_phys_addr_t ram_bases[2],
target_phys_addr_t ram_sizes[2],
qemu_irq **picp,
diff --git a/qemu/hw/ppc440.h b/qemu/hw/ppc440.h
index b0e0674..3a979d5 100644
--- a/qemu/hw/ppc440.h
+++ b/qemu/hw/ppc440.h
@@ -20,7 +20,7 @@
#include "exec-all.h"
#include "boards.h"
-void ppc440_init(CPUState *env,
+void ppc440ep_init(CPUState *env,
target_phys_addr_t ram_bases[2],
target_phys_addr_t ram_sizes[2],
qemu_irq **picp,
diff --git a/qemu/hw/ppc440_bamboo.c b/qemu/hw/ppc440_bamboo.c
index d582276..114729f 100644
--- a/qemu/hw/ppc440_bamboo.c
+++ b/qemu/hw/ppc440_bamboo.c
@@ -62,8 +62,7 @@ void bamboo_init(ram_addr_t ram_size, int vga_ram_size,
printf("Ram size of domain is %d bytes\n", (int)ram_size);
/* Setup CPU */
- /* XXX We cheat for now and use 405 */
- env = cpu_ppc_init("405");
+ env = cpu_ppc_init("440");
if (!env) {
fprintf(stderr, "Unable to initilize CPU!\n");
exit(1);
@@ -71,7 +70,7 @@ void bamboo_init(ram_addr_t ram_size, int vga_ram_size,
/* call init */
printf("Calling function ppc440_init\n");
- ppc440_init(env, ram_bases, ram_sizes, &pic,1);
+ ppc440ep_init(env, ram_bases, ram_sizes, &pic,1);
printf("Done calling ppc440_init\n");
/* Register mem */
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
kvm-commits mailing list
kvm-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/kvm-commits
