commit 7b62a955047934bab158e84ecb63cb432c193ace
author j_mayer <j_mayer@c046a42c-6fe2-441c-8c8c-71466251a162> Sat Nov 17 02:04:00 2007 +0000
committer j_mayer <j_mayer@c046a42c-6fe2-441c-8c8c-71466251a162> Sat Nov 17 02:04:00 2007 +0000
tree e9b6c0cc8786a675432824952574a5d9a5399b0f
parent 5e692ecdbff27d5a4c9ffdc76fa43d3dc163d119

Add missing definition for number of input pins for the PowerPC 970 bus.
Use proper INPUT_NB definitions to allocate PowerPC input pins structure,
  fixing a buffer overflow in the 6xx bus case.


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3659 c046a42c-6fe2-441c-8c8c-71466251a162

hw/ppc.c

diff --git a/hw/ppc.c b/hw/ppc.c
index 92e5bfe..a25a360 100644
--- a/hw/ppc.c
+++ b/hw/ppc.c
@@ -172,7 +172,8 @@
 
 void ppc6xx_irq_init (CPUState *env)
 {
-    env->irq_inputs = (void **)qemu_allocate_irqs(&ppc6xx_set_irq, env, 6);
+    env->irq_inputs = (void **)qemu_allocate_irqs(&ppc6xx_set_irq, env,
+                                                  PPC6xx_INPUT_NB);
 }
 
 #if defined(TARGET_PPC64)
@@ -295,7 +296,8 @@
 
 void ppc970_irq_init (CPUState *env)
 {
-    env->irq_inputs = (void **)qemu_allocate_irqs(&ppc970_set_irq, env, 7);
+    env->irq_inputs = (void **)qemu_allocate_irqs(&ppc970_set_irq, env,
+                                                  PPC970_INPUT_NB);
 }
 #endif /* defined(TARGET_PPC64) */
 

target-ppc/cpu.h

diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h
index 7705ca2..f249522 100644
--- a/target-ppc/cpu.h
+++ b/target-ppc/cpu.h
@@ -1249,6 +1249,7 @@
     PPC970_INPUT_MCP        = 4,
     PPC970_INPUT_INT        = 5,
     PPC970_INPUT_THINT      = 6,
+    PPC970_INPUT_NB,
 };
 #endif