* [Qemu-devel] [PATCH v1 1/1] xilinx_axidma: Do not set DMA .notify to NULL after notify
@ 2013-06-07 3:05 peter.crosthwaite
2013-06-10 11:10 ` Edgar E. Iglesias
0 siblings, 1 reply; 2+ messages in thread
From: peter.crosthwaite @ 2013-06-07 3:05 UTC (permalink / raw)
To: qemu-devel; +Cc: edgar.iglesias, Peter Crosthwaite, qemu-stable, Wendy Liang
From: Wendy Liang <jliang@xilinx.com>
If a stream notify function is not ready, it may re-populate the notify call-
back to indicate it should be re-polled later. This break in this usage, as
immediately following the notify() call, .notify is set to NULL. reverse the
ordering of the notify call and NULL assignment accordingly.
[PC: Reworked commit message]
Signed-off-by: Wendy Liang <jliang@xilinx.com>
Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
---
hw/dma/xilinx_axidma.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/hw/dma/xilinx_axidma.c b/hw/dma/xilinx_axidma.c
index 3a3ef8a..50054cf 100644
--- a/hw/dma/xilinx_axidma.c
+++ b/hw/dma/xilinx_axidma.c
@@ -514,8 +514,9 @@ static void axidma_write(void *opaque, hwaddr addr,
break;
}
if (sid == 1 && d->notify) {
- d->notify(d->notify_opaque);
+ StreamCanPushNotifyFn notifytmp = d->notify;
d->notify = NULL;
+ notifytmp(d->notify_opaque);
}
stream_update_irq(s);
}
--
1.8.3.rc1.44.gb387c77.dirty
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Qemu-devel] [PATCH v1 1/1] xilinx_axidma: Do not set DMA .notify to NULL after notify
2013-06-07 3:05 [Qemu-devel] [PATCH v1 1/1] xilinx_axidma: Do not set DMA .notify to NULL after notify peter.crosthwaite
@ 2013-06-10 11:10 ` Edgar E. Iglesias
0 siblings, 0 replies; 2+ messages in thread
From: Edgar E. Iglesias @ 2013-06-10 11:10 UTC (permalink / raw)
To: peter.crosthwaite; +Cc: qemu-devel, Wendy Liang, qemu-stable
On Fri, Jun 07, 2013 at 01:05:38PM +1000, peter.crosthwaite@xilinx.com wrote:
> From: Wendy Liang <jliang@xilinx.com>
>
> If a stream notify function is not ready, it may re-populate the notify call-
> back to indicate it should be re-polled later. This break in this usage, as
> immediately following the notify() call, .notify is set to NULL. reverse the
> ordering of the notify call and NULL assignment accordingly.
>
> [PC: Reworked commit message]
>
> Signed-off-by: Wendy Liang <jliang@xilinx.com>
> Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Applied master, thanks Wendy and Peter.
ACK for stable.
Acked-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
> ---
> hw/dma/xilinx_axidma.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/hw/dma/xilinx_axidma.c b/hw/dma/xilinx_axidma.c
> index 3a3ef8a..50054cf 100644
> --- a/hw/dma/xilinx_axidma.c
> +++ b/hw/dma/xilinx_axidma.c
> @@ -514,8 +514,9 @@ static void axidma_write(void *opaque, hwaddr addr,
> break;
> }
> if (sid == 1 && d->notify) {
> - d->notify(d->notify_opaque);
> + StreamCanPushNotifyFn notifytmp = d->notify;
> d->notify = NULL;
> + notifytmp(d->notify_opaque);
> }
> stream_update_irq(s);
> }
> --
> 1.8.3.rc1.44.gb387c77.dirty
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-06-10 11:10 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-06-07 3:05 [Qemu-devel] [PATCH v1 1/1] xilinx_axidma: Do not set DMA .notify to NULL after notify peter.crosthwaite
2013-06-10 11:10 ` Edgar E. Iglesias
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).