[PATCH] [RESEND] qemu: simulate edge-triggered interrupt in master PIC for time-drift-fix

[PATCH] [RESEND] qemu: simulate edge-triggered interrupt in master PIC for time-drift-fix

[Carlo Marcelo Arenas Belon]

The following patch fixes 1a483ef4040ed380bf69d684783d06a617073256 so that the
parent PIC pointer is used to send the edge irq0 instead of the PIC pair and
that is an incompatible pointer type as reported in :

  qemu/hw/i8259.c: In function `pic_read_irq':
  qemu/hw/i8259.c:248:
  warning: passing arg 1 of `pic_set_irq1' from incompatible pointer type
  qemu/hw/i8259.c:249:
  warning: passing arg 1 of `pic_set_irq1' from incompatible pointer type

the code is equivalent as the compiler packs the PicState2 struct for s in a
way that makes "s" and "&s->pics[0]" point to the same address.

Signed-off-by: Carlo Marcelo Arenas Belon <carenas-kLeDWSohozoJb6fo7hG9ng@public.gmane.org>
---
 qemu/hw/i8259.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/qemu/hw/i8259.c b/qemu/hw/i8259.c
index 01447d7..60063d4 100644
--- a/qemu/hw/i8259.c
+++ b/qemu/hw/i8259.c
@@ -245,8 +245,8 @@ int pic_read_irq(PicState2 *s)
 	    if (timer_ints_to_push > 0) {
 		timer_ints_to_push--;
                 /* simulate an edge irq0, like the one generated by i8254 */
-                pic_set_irq1(s, 0, 0);
-                pic_set_irq1(s, 0, 1);
+                pic_set_irq1(&s->pics[0], 0, 0);
+                pic_set_irq1(&s->pics[0], 0, 1);
 	    }
 	}
 
-- 
1.5.2.5


-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/

Re: [PATCH] [RESEND] qemu: simulate edge-triggered interrupt in master PIC for time-drift-fix

[Avi Kivity]

Carlo Marcelo Arenas Belon wrote:
> The following patch fixes 1a483ef4040ed380bf69d684783d06a617073256 so that the
> parent PIC pointer is used to send the edge irq0 instead of the PIC pair and
> that is an incompatible pointer type as reported in :
>
>   qemu/hw/i8259.c: In function `pic_read_irq':
>   qemu/hw/i8259.c:248:
>   warning: passing arg 1 of `pic_set_irq1' from incompatible pointer type
>   qemu/hw/i8259.c:249:
>   warning: passing arg 1 of `pic_set_irq1' from incompatible pointer type
>
> the code is equivalent as the compiler packs the PicState2 struct for s in a
> way that makes "s" and "&s->pics[0]" point to the same address.
>
>   

Applied, thanks.

-- 
error compiling committee.c: too many arguments to function


-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/