Skip to contentSkip to conversation

qemu: simulate edge-triggered interrupt in master PIC for time-drift-fix

PATCH RESEND Applied Carlo Marcelo Arenas Belon 2 participants 2 messages Nov 18, 2007 KVM

lore
Share & tools
lore
#0 lore raw

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

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.

---
 qemu/hw/i8259.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
qemu/hw/i8259.c +2 -2
index 01447d7..60063d4 100644
@@ -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);
 	    }
 	}
 
Signature · 7 lines
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/
Applied
#1 lore raw
Quoted 4 lines · 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 :

Quoted 10 lines

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.

Signature · 7 lines
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/