diff options
| author | Aurelien Jarno <aurelien@aurel32.net> | 2013-05-19 13:22:11 +0200 |
|---|---|---|
| committer | Aurelien Jarno <aurelien@aurel32.net> | 2013-05-20 01:54:14 +0200 |
| commit | b9b5df6f0cee6b09ef3b2e5228761dd3c2cdcad7 (patch) | |
| tree | 4261dfbe080e67a8428ce305bc8872845bfb229c /hw/ide/macio.c | |
| parent | 118d1e4f59c36078a0d76d090d4c16deace47233 (diff) | |
| download | focaccia-qemu-b9b5df6f0cee6b09ef3b2e5228761dd3c2cdcad7.tar.gz focaccia-qemu-b9b5df6f0cee6b09ef3b2e5228761dd3c2cdcad7.zip | |
ide/macio: fix wrong opaque with TRIM support
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 <mjt@tls.msk.ru> Tested-off-by: Michael Tokarev <mjt@tls.msk.ru> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Diffstat (limited to 'hw/ide/macio.c')
| -rw-r--r-- | hw/ide/macio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/ide/macio.c b/hw/ide/macio.c index bf12a100d4..e1e4f41597 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; } |