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

diff --git a/hw/ppc.c b/hw/ppc.c
index 92e5bfedb25b6b2cb8e57d14e2923ebc017cc2fd..a25a3607f31a872df2a27c6f04a05f0abc428574 100644 (file)
--- a/hw/ppc.c
+++ b/hw/ppc.c
@@ -172,7 +172,8 @@ static void ppc6xx_set_irq (void *opaque, int pin, int level)
 
 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 @@ static void ppc970_set_irq (void *opaque, int pin, int level)
 
 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) */
 

diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h
index 7705ca20c96ff0eb332417d83dabaa842c85daae..f249522af286f844df43e58eb0be5fb7d2fe525e 100644 (file)
--- a/target-ppc/cpu.h
+++ b/target-ppc/cpu.h
@@ -1249,6 +1249,7 @@ enum {
     PPC970_INPUT_MCP        = 4,
     PPC970_INPUT_INT        = 5,
     PPC970_INPUT_THINT      = 6,
+    PPC970_INPUT_NB,
 };
 #endif