| Message ID | 1368962825-553-1-git-send-email-aurelien@aurel32.net |
|---|---|
| State | New |
| Headers | show |
Il 19/05/2013 13:27, Aurelien Jarno ha scritto: > 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> > Cc: Kevin Wolf <kwolf@redhat.com> > Cc: Christoph Hellwig <hch@lst.de> > Signed-off-by: Aurelien Jarno <aurelien@aurel32.net> > --- > 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; > } > Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Thanks! Paolo
19.05.2013 15:27, Aurelien Jarno wrote: > 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> > Cc: Kevin Wolf <kwolf@redhat.com> > Cc: Christoph Hellwig <hch@lst.de> > Signed-off-by: Aurelien Jarno <aurelien@aurel32.net> Tested-off-by: Michael Tokarev <mjt@tls.msk.ru> I can confirm with this patch the ppc testcase works again. Thanks! /mjt
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; }
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> Cc: Kevin Wolf <kwolf@redhat.com> Cc: Christoph Hellwig <hch@lst.de> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net> --- hw/ide/macio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)