[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-block] [Qemu-devel] [PATCH v2 06/17] bochs: Implement .bdrv_co
From: |
Eric Blake |
Subject: |
Re: [Qemu-block] [Qemu-devel] [PATCH v2 06/17] bochs: Implement .bdrv_co_preadv() interface |
Date: |
Thu, 28 Apr 2016 09:50:40 -0600 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 |
On 04/28/2016 07:16 AM, Kevin Wolf wrote:
> Signed-off-by: Kevin Wolf <address@hidden>
> ---
> block/bochs.c | 51 +++++++++++++++++++++++++++++++++------------------
> 1 file changed, 33 insertions(+), 18 deletions(-)
>
> + uint64_t sector_num = offset >> BDRV_SECTOR_BITS;
> + int nb_sectors = bytes >> BDRV_SECTOR_BITS;
Since we're using the named constant here (instead of /512 or >>9),...
> + uint64_t bytes_done = 0;
> + QEMUIOVector local_qiov;
> int ret;
>
> + assert((offset & (BDRV_SECTOR_SIZE - 1)) == 0);
> + assert((bytes & (BDRV_SECTOR_SIZE - 1)) == 0);
> +
> + qemu_iovec_init(&local_qiov, qiov->niov);
> + qemu_co_mutex_lock(&s->lock);
> +
> while (nb_sectors > 0) {
> int64_t block_offset = seek_to_sector(bs, sector_num);
> if (block_offset < 0) {
> - return block_offset;
> - } else if (block_offset > 0) {
> - ret = bdrv_pread(bs->file->bs, block_offset, buf, 512);
> + ret = block_offset;
> + goto fail;
> + }
> +
> + qemu_iovec_reset(&local_qiov);
> + qemu_iovec_concat(&local_qiov, qiov, bytes_done, 512);
should we also use the named constant BDRV_SECTOR_SIZE here instead of 512?
I don't care strongly enough for a respin, though, particularly since it
would affect line wrapping.
Reviewed-by: Eric Blake <address@hidden>
> +
> + if (block_offset > 0) {
> + ret = bdrv_co_preadv(bs->file->bs, block_offset, 512,
> + &local_qiov, 0);
> if (ret < 0) {
> - return ret;
> + goto fail;
> }
> } else {
> - memset(buf, 0, 512);
> + qemu_iovec_memset(&local_qiov, 0, 0, 512);
> }
> nb_sectors--;
> sector_num++;
> - buf += 512;
> + bytes_done += 512;
More of the magic 512, if you care.
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature
- [Qemu-block] [PATCH v2 01/17] block: Introduce bdrv_driver_preadv(), (continued)
- [Qemu-block] [PATCH v2 01/17] block: Introduce bdrv_driver_preadv(), Kevin Wolf, 2016/04/28
- [Qemu-block] [PATCH v2 02/17] block: Introduce bdrv_driver_pwritev(), Kevin Wolf, 2016/04/28
- [Qemu-block] [PATCH v2 03/17] block: Support AIO drivers in bdrv_driver_preadv/pwritev(), Kevin Wolf, 2016/04/28
- [Qemu-block] [PATCH v2 05/17] block: Introduce .bdrv_co_preadv/pwritev BlockDriver function, Kevin Wolf, 2016/04/28
- [Qemu-block] [PATCH v2 04/17] block: Rename bdrv_co_do_preadv/writev to bdrv_co_preadv/writev, Kevin Wolf, 2016/04/28
- [Qemu-block] [PATCH v2 06/17] bochs: Implement .bdrv_co_preadv() interface, Kevin Wolf, 2016/04/28
- Re: [Qemu-block] [Qemu-devel] [PATCH v2 06/17] bochs: Implement .bdrv_co_preadv() interface,
Eric Blake <=
- [Qemu-block] [PATCH v2 08/17] dmg: Implement .bdrv_co_preadv() interface, Kevin Wolf, 2016/04/28
- [Qemu-block] [PATCH v2 07/17] cloop: Implement .bdrv_co_preadv() interface, Kevin Wolf, 2016/04/28
- [Qemu-block] [PATCH v2 09/17] vdi: Implement .bdrv_co_preadv() interface, Kevin Wolf, 2016/04/28
- [Qemu-block] [PATCH v2 10/17] vdi: Implement .bdrv_co_pwritev() interface, Kevin Wolf, 2016/04/28
- [Qemu-block] [PATCH v2 11/17] vmdk: Add vmdk_find_offset_in_cluster(), Kevin Wolf, 2016/04/28
- [Qemu-block] [PATCH v2 15/17] vpc: Implement .bdrv_co_pwritev() interface, Kevin Wolf, 2016/04/28
- [Qemu-block] [PATCH v2 17/17] block: Remove BlockDriver.bdrv_read/write, Kevin Wolf, 2016/04/28
- [Qemu-block] [PATCH v2 12/17] vmdk: Implement .bdrv_co_preadv() interface, Kevin Wolf, 2016/04/28