ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qed: Remove ret argument from qed_aio_next_io() 

All callers pass ret = 0, so we can just remove it.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Kevin Wolf 2016-11-18 13:40:13 +01:00
parent 0596be7e6a
commit dddf8db10b
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
block/qed.c
View File

@ -253,11 +253,11 @@ static CachedL2Table *qed_new_l2_table(BDRVQEDState *s)
return l2_table; return l2_table;
} }
static void qed_aio_next_io(QEDAIOCB *acb, int ret); static void qed_aio_next_io(QEDAIOCB *acb);
static void qed_aio_start_io(QEDAIOCB *acb) static void qed_aio_start_io(QEDAIOCB *acb)
{ {
qed_aio_next_io(acb, 0); qed_aio_next_io(acb);
} }
static void qed_plug_allocating_write_reqs(BDRVQEDState *s) static void qed_plug_allocating_write_reqs(BDRVQEDState *s)
@ -1273,13 +1273,14 @@ static int qed_aio_read_data(void *opaque, int ret, uint64_t offset, size_t len)
/** /**
* Begin next I/O or complete the request * Begin next I/O or complete the request
*/ */
static void qed_aio_next_io(QEDAIOCB *acb, int ret) static void qed_aio_next_io(QEDAIOCB *acb)
{ {
BDRVQEDState *s = acb_to_s(acb); BDRVQEDState *s = acb_to_s(acb);
uint64_t offset; uint64_t offset;
size_t len; size_t len;
int ret;
trace_qed_aio_next_io(s, acb, ret, acb->cur_pos + acb->cur_qiov.size); trace_qed_aio_next_io(s, acb, 0, acb->cur_pos + acb->cur_qiov.size);
if (acb->backing_qiov) { if (acb->backing_qiov) {
qemu_iovec_destroy(acb->backing_qiov); qemu_iovec_destroy(acb->backing_qiov);
@ -1287,12 +1288,6 @@ static void qed_aio_next_io(QEDAIOCB *acb, int ret)
acb->backing_qiov = NULL; acb->backing_qiov = NULL;
} }
/* Handle I/O error */
if (ret) {
qed_aio_complete(acb, ret);
return;
}
acb->qiov_offset += acb->cur_qiov.size; acb->qiov_offset += acb->cur_qiov.size;
acb->cur_pos += acb->cur_qiov.size; acb->cur_pos += acb->cur_qiov.size;
qemu_iovec_reset(&acb->cur_qiov); qemu_iovec_reset(&acb->cur_qiov);
@ -1323,7 +1318,7 @@ static void qed_aio_next_io(QEDAIOCB *acb, int ret)
} }
return; return;
} }
qed_aio_next_io(acb, 0); qed_aio_next_io(acb);
} }
static BlockAIOCB *qed_aio_setup(BlockDriverState *bs, static BlockAIOCB *qed_aio_setup(BlockDriverState *bs,