diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-12-05 09:39:25 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-12-05 09:39:25 -0600 |
| commit | eb5d5beaebd102599a915f6c4813d445ddc9dc84 (patch) | |
| tree | 12ce2331571a30c67bde0b8f4ddb55996dd0ba65 /block/qed-table.c | |
| parent | f6480ca3f3423be5bee8b673ee6f5cc387659def (diff) | |
| parent | 922453bca6a927bb527068ae8679d587cfa45dbc (diff) | |
Merge remote-tracking branch 'kwolf/for-anthony' into staging
Diffstat (limited to 'block/qed-table.c')
| -rw-r--r-- | block/qed-table.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/block/qed-table.c b/block/qed-table.c index f31f9ff069..8ee844346c 100644 --- a/block/qed-table.c +++ b/block/qed-table.c @@ -29,7 +29,7 @@ static void qed_read_table_cb(void *opaque, int ret) { QEDReadTableCB *read_table_cb = opaque; QEDTable *table = read_table_cb->table; - int noffsets = read_table_cb->iov.iov_len / sizeof(uint64_t); + int noffsets = read_table_cb->qiov.size / sizeof(uint64_t); int i; /* Handle I/O error */ @@ -65,7 +65,7 @@ static void qed_read_table(BDRVQEDState *s, uint64_t offset, QEDTable *table, qemu_iovec_init_external(qiov, &read_table_cb->iov, 1); aiocb = bdrv_aio_readv(s->bs->file, offset / BDRV_SECTOR_SIZE, qiov, - read_table_cb->iov.iov_len / BDRV_SECTOR_SIZE, + qiov->size / BDRV_SECTOR_SIZE, qed_read_table_cb, read_table_cb); if (!aiocb) { qed_read_table_cb(read_table_cb, -EIO); @@ -160,7 +160,7 @@ static void qed_write_table(BDRVQEDState *s, uint64_t offset, QEDTable *table, aiocb = bdrv_aio_writev(s->bs->file, offset / BDRV_SECTOR_SIZE, &write_table_cb->qiov, - write_table_cb->iov.iov_len / BDRV_SECTOR_SIZE, + write_table_cb->qiov.size / BDRV_SECTOR_SIZE, qed_write_table_cb, write_table_cb); if (!aiocb) { qed_write_table_cb(write_table_cb, -EIO); |