From patchwork Sun May 19 11:27:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aurelien Jarno X-Patchwork-Id: 244806 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 55EC32C0096 for ; Sun, 19 May 2013 21:27:53 +1000 (EST) Received: from localhost ([::1]:42205 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ue1mJ-00083t-Al for incoming@patchwork.ozlabs.org; Sun, 19 May 2013 07:27:51 -0400 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 Received: from [2001:470:d4ed:0:ea11:32ff:fea1:831a] (helo=ohm.aurel32.net) by hall.aurel32.net with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72) (envelope-from ) id 1Ue1lf-000714-HA; Sun, 19 May 2013 13:27:11 +0200 Received: from aurel32 by ohm.aurel32.net with local (Exim 4.80) (envelope-from ) id 1Ue1le-00009c-8K; Sun, 19 May 2013 13:27:10 +0200 From: Aurelien Jarno To: qemu-devel@nongnu.org Date: Sun, 19 May 2013 13:27:05 +0200 Message-Id: <1368962825-553-1-git-send-email-aurelien@aurel32.net> X-Mailer: git-send-email 1.7.10.4 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:470:1f15:c4f::1 Cc: Kevin Wolf , Michael Tokarev , Christoph Hellwig , Aurelien Jarno Subject: [Qemu-devel] [PATCH for 1.5] ide/macio: fix wrong opaque with TRIM support X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 Reviewed-by: Paolo Bonzini --- 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; }