From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:57590)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <edgar.iglesias@gmail.com>) id 1Ulzzn-00023I-W0
	for qemu-devel@nongnu.org; Mon, 10 Jun 2013 07:10:45 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <edgar.iglesias@gmail.com>) id 1Ulzzi-00036f-N9
	for qemu-devel@nongnu.org; Mon, 10 Jun 2013 07:10:43 -0400
Date: Mon, 10 Jun 2013 13:10:29 +0200
From: "Edgar E. Iglesias" <edgar.iglesias@gmail.com>
Message-ID: <20130610111028.GC5991@smtp.vpn>
References: <c09de8a7bc669239a1c2f87594d29076fdb49491.1370573523.git.peter.crosthwaite@xilinx.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <c09de8a7bc669239a1c2f87594d29076fdb49491.1370573523.git.peter.crosthwaite@xilinx.com>
Subject: Re: [Qemu-devel] [PATCH v1 1/1] xilinx_axidma: Do not set DMA
 .notify to NULL after notify
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: peter.crosthwaite@xilinx.com
Cc: qemu-devel@nongnu.org, Wendy Liang <jliang@xilinx.com>, qemu-stable@nongnu.org

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
>