openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ide: pass IDEState to trim AIO callback 

It will be needed to handle invalid requests

Signed-off-by: Anton Nefedov <anton.nefedov@virtuozzo.com>
Message-id: 1512735034-35327-2-git-send-email-anton.nefedov@virtuozzo.com
Signed-off-by: John Snow <jsnow@redhat.com>
This commit is contained in:
Anton Nefedov 2017-12-08 15:10:32 +03:00 committed by John Snow
parent b384cd95eb
commit ef0e64a983
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hw/ide/core.c
View File

@ -382,7 +382,7 @@ static void ide_set_signature(IDEState *s)
typedef struct TrimAIOCB { typedef struct TrimAIOCB {
BlockAIOCB common; BlockAIOCB common;
BlockBackend *blk; IDEState *s;
QEMUBH *bh; QEMUBH *bh;
int ret; int ret;
QEMUIOVector *qiov; QEMUIOVector *qiov;
@ -425,6 +425,8 @@ static void ide_trim_bh_cb(void *opaque)
static void ide_issue_trim_cb(void *opaque, int ret) static void ide_issue_trim_cb(void *opaque, int ret)
{ {
TrimAIOCB *iocb = opaque; TrimAIOCB *iocb = opaque;
IDEState *s = iocb->s;
if (ret >= 0) { if (ret >= 0) {
while (iocb->j < iocb->qiov->niov) { while (iocb->j < iocb->qiov->niov) {
int j = iocb->j; int j = iocb->j;
@ -442,7 +444,7 @@ static void ide_issue_trim_cb(void *opaque, int ret)
} }
/* Got an entry! Submit and exit. */ /* Got an entry! Submit and exit. */
iocb->aiocb = blk_aio_pdiscard(iocb->blk, iocb->aiocb = blk_aio_pdiscard(s->blk,
sector << BDRV_SECTOR_BITS, sector << BDRV_SECTOR_BITS,
count << BDRV_SECTOR_BITS, count << BDRV_SECTOR_BITS,
ide_issue_trim_cb, opaque); ide_issue_trim_cb, opaque);
@ -466,11 +468,11 @@ BlockAIOCB *ide_issue_trim(
int64_t offset, QEMUIOVector *qiov, int64_t offset, QEMUIOVector *qiov,
BlockCompletionFunc *cb, void *cb_opaque, void *opaque) BlockCompletionFunc *cb, void *cb_opaque, void *opaque)
{ {
BlockBackend *blk = opaque; IDEState *s = opaque;
TrimAIOCB *iocb; TrimAIOCB *iocb;
iocb = blk_aio_get(&trim_aiocb_info, blk, cb, cb_opaque); iocb = blk_aio_get(&trim_aiocb_info, s->blk, cb, cb_opaque);
iocb->blk = blk; iocb->s = s;
iocb->bh = qemu_bh_new(ide_trim_bh_cb, iocb); iocb->bh = qemu_bh_new(ide_trim_bh_cb, iocb);
iocb->ret = 0; iocb->ret = 0;
iocb->qiov = qiov; iocb->qiov = qiov;
@ -900,7 +902,7 @@ static void ide_dma_cb(void *opaque, int ret)
case IDE_DMA_TRIM: case IDE_DMA_TRIM:
s->bus->dma->aiocb = dma_blk_io(blk_get_aio_context(s->blk), s->bus->dma->aiocb = dma_blk_io(blk_get_aio_context(s->blk),
&s->sg, offset, BDRV_SECTOR_SIZE, &s->sg, offset, BDRV_SECTOR_SIZE,
ide_issue_trim, s->blk, ide_dma_cb, s, ide_issue_trim, s, ide_dma_cb, s,
DMA_DIRECTION_TO_DEVICE); DMA_DIRECTION_TO_DEVICE);
break; break;
default: default: