Message ID | 1410891148-28849-16-git-send-email-armbru@redhat.com |
---|---|
State | New |
Headers | show |
On 16.09.2014 20:12, Markus Armbruster wrote: > Add a BlockBackend member to TrimAIOCB, so ide_issue_trim_cb() can use > blk_aio_discard() instead of bdrv_aio_discard(). > > Signed-off-by: Markus Armbruster <armbru@redhat.com> > --- > hw/ide/core.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) Reviewed-by: Max Reitz <mreitz@redhat.com>
Am 16.09.2014 um 20:12 hat Markus Armbruster geschrieben: > Add a BlockBackend member to TrimAIOCB, so ide_issue_trim_cb() can use > blk_aio_discard() instead of bdrv_aio_discard(). > > Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Kevin Wolf <kwolf@redhat.com>
diff --git a/hw/ide/core.c b/hw/ide/core.c index f02ce4a..23964a2 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -362,6 +362,7 @@ static void ide_set_signature(IDEState *s) typedef struct TrimAIOCB { BlockAIOCB common; + BlockBackend *blk; QEMUBH *bh; int ret; QEMUIOVector *qiov; @@ -423,8 +424,8 @@ static void ide_issue_trim_cb(void *opaque, int ret) } /* Got an entry! Submit and exit. */ - iocb->aiocb = bdrv_aio_discard(iocb->common.bs, sector, count, - ide_issue_trim_cb, opaque); + iocb->aiocb = blk_aio_discard(iocb->blk, sector, count, + ide_issue_trim_cb, opaque); return; } @@ -448,6 +449,7 @@ BlockAIOCB *ide_issue_trim(BlockBackend *blk, TrimAIOCB *iocb; iocb = blk_aio_get(&trim_aiocb_info, blk, cb, opaque); + iocb->blk = blk; iocb->bh = qemu_bh_new(ide_trim_bh_cb, iocb); iocb->ret = 0; iocb->qiov = qiov;
Add a BlockBackend member to TrimAIOCB, so ide_issue_trim_cb() can use blk_aio_discard() instead of bdrv_aio_discard(). Signed-off-by: Markus Armbruster <armbru@redhat.com> --- hw/ide/core.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)