diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2016-11-18 13:40:13 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2017-06-26 14:51:14 +0200 |
| commit | dddf8db10b47d34d9d469ffe45e000170666ecdd (patch) | |
| tree | 6dbe32723e475f7feb28bcb33bec1de8323c6d23 | |
| parent | 0596be7e6a39da44e2dcba74a97bb8b89cb71bdd (diff) | |
| download | focaccia-qemu-dddf8db10b47d34d9d469ffe45e000170666ecdd.tar.gz focaccia-qemu-dddf8db10b47d34d9d469ffe45e000170666ecdd.zip | |
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>
| -rw-r--r-- | block/qed.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/block/qed.c b/block/qed.c index 6f83831abe..db80987dc3 100644 --- a/block/qed.c +++ b/block/qed.c @@ -253,11 +253,11 @@ static CachedL2Table *qed_new_l2_table(BDRVQEDState *s) 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) { - qed_aio_next_io(acb, 0); + qed_aio_next_io(acb); } 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 */ -static void qed_aio_next_io(QEDAIOCB *acb, int ret) +static void qed_aio_next_io(QEDAIOCB *acb) { BDRVQEDState *s = acb_to_s(acb); uint64_t offset; 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) { qemu_iovec_destroy(acb->backing_qiov); @@ -1287,12 +1288,6 @@ static void qed_aio_next_io(QEDAIOCB *acb, int ret) acb->backing_qiov = NULL; } - /* Handle I/O error */ - if (ret) { - qed_aio_complete(acb, ret); - return; - } - acb->qiov_offset += acb->cur_qiov.size; acb->cur_pos += acb->cur_qiov.size; qemu_iovec_reset(&acb->cur_qiov); @@ -1323,7 +1318,7 @@ static void qed_aio_next_io(QEDAIOCB *acb, int ret) } return; } - qed_aio_next_io(acb, 0); + qed_aio_next_io(acb); } static BlockAIOCB *qed_aio_setup(BlockDriverState *bs, |