Revision 3f4cb3d3 block-qcow2.c

b/block-qcow2.c
1346 1346
            n1 = backing_read1(bs->backing_hd, acb->sector_num,
1347 1347
                               acb->buf, acb->n);
1348 1348
            if (n1 > 0) {
1349
                acb->hd_iov.iov_base = acb->buf;
1349
                acb->hd_iov.iov_base = (void *)acb->buf;
1350 1350
                acb->hd_iov.iov_len = acb->n * 512;
1351 1351
                qemu_iovec_init_external(&acb->hd_qiov, &acb->hd_iov, 1);
1352 1352
                acb->hd_aiocb = bdrv_aio_readv(bs->backing_hd, acb->sector_num,
......
1381 1381
            goto done;
1382 1382
        }
1383 1383

  
1384
        acb->hd_iov.iov_base = acb->buf;
1384
        acb->hd_iov.iov_base = (void *)acb->buf;
1385 1385
        acb->hd_iov.iov_len = acb->n * 512;
1386 1386
        qemu_iovec_init_external(&acb->hd_qiov, &acb->hd_iov, 1);
1387 1387
        acb->hd_aiocb = bdrv_aio_readv(s->hd,
......
1417 1417
        acb->buf = acb->orig_buf = qemu_memalign(512, qiov->size);
1418 1418
        if (is_write)
1419 1419
            qemu_iovec_to_buffer(qiov, acb->buf);
1420
    } else
1421
        acb->buf = qiov->iov->iov_base;
1420
    } else {
1421
        acb->buf = (uint8_t *)qiov->iov->iov_base;
1422
    }
1422 1423
    acb->nb_sectors = nb_sectors;
1423 1424
    acb->n = 0;
1424 1425
    acb->cluster_offset = 0;

Also available in: Unified diff