提交 7b62a955 编写于 作者: J j_mayer

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
上级 5e692ecd
...@@ -172,7 +172,8 @@ static void ppc6xx_set_irq (void *opaque, int pin, int level) ...@@ -172,7 +172,8 @@ static void ppc6xx_set_irq (void *opaque, int pin, int level)
void ppc6xx_irq_init (CPUState *env) 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) #if defined(TARGET_PPC64)
...@@ -295,7 +296,8 @@ static void ppc970_set_irq (void *opaque, int pin, int level) ...@@ -295,7 +296,8 @@ static void ppc970_set_irq (void *opaque, int pin, int level)
void ppc970_irq_init (CPUState *env) 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) */ #endif /* defined(TARGET_PPC64) */
......
...@@ -1249,6 +1249,7 @@ enum { ...@@ -1249,6 +1249,7 @@ enum {
PPC970_INPUT_MCP = 4, PPC970_INPUT_MCP = 4,
PPC970_INPUT_INT = 5, PPC970_INPUT_INT = 5,
PPC970_INPUT_THINT = 6, PPC970_INPUT_THINT = 6,
PPC970_INPUT_NB,
}; };
#endif #endif
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册