From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:35654) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ue1lz-00080S-HT for qemu-devel@nongnu.org; Sun, 19 May 2013 07:27:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ue1ls-0006cm-07 for qemu-devel@nongnu.org; Sun, 19 May 2013 07:27:31 -0400 Received: from hall.aurel32.net ([2001:470:1f15:c4f::1]:33299) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ue1lr-0006cH-QI for qemu-devel@nongnu.org; Sun, 19 May 2013 07:27:23 -0400 From: Aurelien Jarno Date: Sun, 19 May 2013 13:27:05 +0200 Message-Id: <1368962825-553-1-git-send-email-aurelien@aurel32.net> Subject: [Qemu-devel] [PATCH for 1.5] ide/macio: fix wrong opaque with TRIM support List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Michael Tokarev , Christoph Hellwig , Aurelien Jarno Commit 215e47b9 enabled TRIM by default, which revealed a bug in TRIM support for the IDE macio emulation driver, introduced in d353fb72. The call to dma_bdrv_io() is using a wrong opaque of type IDEState instead of DBDMA_io. This patch fixes that. Fixes LP#1179104 Reported-by: Michael Tokarev Cc: Kevin Wolf Cc: Christoph Hellwig Signed-off-by: Aurelien Jarno --- hw/ide/macio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/ide/macio.c b/hw/ide/macio.c index bf12a10..e1e4f41 100644 --- a/hw/ide/macio.c +++ b/hw/ide/macio.c @@ -144,7 +144,7 @@ static void pmac_ide_transfer_cb(void *opaque, int ret) break; case IDE_DMA_TRIM: m->aiocb = dma_bdrv_io(s->bs, &s->sg, sector_num, - ide_issue_trim, pmac_ide_transfer_cb, s, + ide_issue_trim, pmac_ide_transfer_cb, io, DMA_DIRECTION_TO_DEVICE); break; } -- 1.7.10.4