Implement bdrv_{pread, pwrite, pwrite_sync, pwrite_zeroes}() using generated_co_wrapper
Subsystems (2)
v5 cover Implement bdrv_{pread, pwrite, pwrite_sync, pwrite_zeroes}() using generated_co_wrapper
Start by making the interfaces of analogous non-coroutine and coroutine functions consistent with each other, then implement the non-coroutine ones using generated_co_wrapper.
For the bdrv_pwrite_sync() case, also add the missing bdrv_co_pwrite_sync() function.
Changes v4 --> v5:
- Picking up a few R-b from v3 that I forgot. Sorry for the noise.
Changes v3 --> v4:
- Removed assert(bytes <= SIZE_MAX) from bdrv_co_{pread,pwrite}() (undoing v3) since bdrv_check_request32(), which is called further down the stack, will cause -EIO to be returned if bytes > SIZE_MAX.
- Audited callers to make sure bdrv_{pread,pwrite}() now returning -EIO instead of -EINVAL when 'bytes' is negative doesn't break things. Still, would appreciate it if someone more accustomed to the code base were able to double-check this.
Changes v2 --> v3:
- Add assert(bytes <= SIZE_MAX) to bdrv_co_{pread,pwrite}().
Changes v1 --> v2:
- Drop unnecessary assignments to ret in vhdx_log_peek_hdr(), vhdx_log_read_sectors(), and vhdx_log_write_sectors().
- Simplify vdi_co_pwritev() return expression.
- Add patch making crypto block callbacks return 0 on success.
- Clarify in commit message that bdrv_pwrite_zeroes() now calls trace_bdrv_co_pwrite_zeroes() and clears the BDRV_REQ_MAY_UNMAP flag when appropriate, which it didn't previously.
- Use _co_ functions in the implementation of bdrv_co_pwrite_sync().
- Add patch converting uses of bdrv_pwrite_sync() into bdrv_co_pwrite_sync() when the callers are already coroutine_fn.
- Add patch making qcow2_mark_dirty() use bdrv_pwrite_sync() instead of calling bdrv_pwrite() and bdrv_flush() separately.
Alberto Faria (10):
block: Add a 'flags' param to bdrv_{pread,pwrite,pwrite_sync}()
block: Change bdrv_{pread,pwrite,pwrite_sync}() param order
block: Make bdrv_{pread,pwrite}() return 0 on success
crypto: Make block callbacks return 0 on success
block: Make bdrv_co_pwrite() take a const buffer
block: Make 'bytes' param of bdrv_co_{pread,pwrite,preadv,pwritev}()
an int64_t
block: Implement bdrv_{pread,pwrite,pwrite_zeroes}() using
generated_co_wrapper
block: Add bdrv_co_pwrite_sync()
block: Use bdrv_co_pwrite_sync() when caller is coroutine_fn block/qcow2: Use bdrv_pwrite_sync() in qcow2_mark_dirty()
block/blklogwrites.c | 6 +-- block/bochs.c | 10 ++-- block/cloop.c | 12 ++--- block/coroutines.h | 4 +- block/crypto.c | 56 +++++++++++----------- block/dmg.c | 36 +++++++------- block/io.c | 55 ++-------------------- block/parallels-ext.c | 6 +-- block/parallels.c | 12 ++--- block/qcow.c | 41 ++++++++-------- block/qcow2-bitmap.c | 14 +++--- block/qcow2-cache.c | 9 ++-- block/qcow2-cluster.c | 19 ++++---- block/qcow2-refcount.c | 58 ++++++++++++----------- block/qcow2-snapshot.c | 53 ++++++++++----------- block/qcow2.c | 80 ++++++++++++++++---------------- block/qed.c | 13 ++---- block/vdi.c | 16 +++---- block/vhdx-log.c | 23 +++++---- block/vhdx.c | 36 +++++++------- block/vmdk.c | 70 +++++++++++++--------------- block/vpc.c | 23 ++++----- block/vvfat.c | 11 +++-- crypto/block-luks.c | 8 ++-- crypto/block.c | 6 +-- include/block/block-io.h | 22 ++++++--- include/block/block_int-io.h | 4 +- include/crypto/block.h | 32 ++++++------- tests/unit/test-block-iothread.c | 12 ++--- tests/unit/test-crypto-block.c | 38 +++++++-------- 30 files changed, 370 insertions(+), 415 deletions(-)
Signature · 1 line
2.35.3
PATCH v5 1/10 block: Add a 'flags' param to bdrv_{pread, pwrite, pwrite_sync}()
For consistency with other I/O functions, and in preparation to implement them using generated_co_wrapper.
Callers were updated using this Coccinelle script:
@@ expression child, offset, buf, bytes; @@
- bdrv_pread(child, offset, buf, bytes)
+ bdrv_pread(child, offset, buf, bytes, 0)
@@ expression child, offset, buf, bytes; @@
- bdrv_pwrite(child, offset, buf, bytes)
+ bdrv_pwrite(child, offset, buf, bytes, 0)
@@ expression child, offset, buf, bytes; @@
- bdrv_pwrite_sync(child, offset, buf, bytes)
+ bdrv_pwrite_sync(child, offset, buf, bytes, 0)
Resulting overly-long lines were then fixed by hand.
--- block/blklogwrites.c | 4 +-- block/bochs.c | 6 ++-- block/cloop.c | 10 +++--- block/crypto.c | 4 +-- block/dmg.c | 24 +++++++------- block/io.c | 13 ++++---- block/parallels-ext.c | 4 +-- block/parallels.c | 12 +++---- block/qcow.c | 27 ++++++++------- block/qcow2-bitmap.c | 14 ++++---- block/qcow2-cache.c | 7 ++-- block/qcow2-cluster.c | 21 ++++++------ block/qcow2-refcount.c | 42 +++++++++++------------ block/qcow2-snapshot.c | 39 +++++++++++----------- block/qcow2.c | 44 ++++++++++++------------ block/qed.c | 8 ++--- block/vdi.c | 10 +++--- block/vhdx-log.c | 19 +++++------ block/vhdx.c | 32 ++++++++++-------- block/vmdk.c | 57 ++++++++++++++------------------ block/vpc.c | 19 ++++++----- block/vvfat.c | 7 ++-- include/block/block-io.h | 7 ++-- tests/unit/test-block-iothread.c | 8 ++--- 24 files changed, 219 insertions(+), 219 deletions(-)
block/blklogwrites.c +2 -2
@@ -108,7 +108,7 @@ static uint64_t blk_log_writes_find_cur_log_sector(BdrvChild *log,while (cur_idx < nr_entries) {int read_ret =bdrv_pread (log, cur_sector << sector_bits, &cur_entry, -sizeof (cur_entry)); +sizeof (cur_entry),0 );if (read_ret <0 ) {error_setg_errno (errp, -read_ret,"Failed to read log entry %" PRIu64, cur_idx);
@@ -190,7 +190,7 @@ static int blk_log_writes_open(BlockDriverState *bs, QDict *options, int flags, log_sb.nr_entries =cpu_to_le64 (0 ); log_sb.sectorsize =cpu_to_le32 (BDRV_SECTOR_SIZE ); }else { - ret =bdrv_pread (s->log_file,0 , &log_sb,sizeof (log_sb)); + ret =bdrv_pread (s->log_file,0 , &log_sb,sizeof (log_sb),0 );if (ret <0 ) {error_setg_errno (errp, -ret,"Could not read log superblock" ); goto fail_log;
block/bochs.c +3 -3
@@ -116,7 +116,7 @@ static int bochs_open(BlockDriverState *bs, QDict *options, int flags,return -EINVAL ; } - ret =bdrv_pread (bs->file,0 , &bochs,sizeof (bochs)); + ret =bdrv_pread (bs->file,0 , &bochs,sizeof (bochs),0 );if (ret <0 ) {return ret; }
@@ -151,7 +151,7 @@ static int bochs_open(BlockDriverState *bs, QDict *options, int flags, } ret =bdrv_pread (bs->file,le32_to_cpu (bochs.header), s->catalog_bitmap, - s->catalog_size *4 ); + s->catalog_size *4 ,0 );if (ret <0 ) { goto fail; }
@@ -225,7 +225,7 @@ static int64_t seek_to_sector(BlockDriverState *bs, int64_t sector_num)/* read in bitmap for current extent */ ret =bdrv_pread (bs->file, bitmap_offset + (extent_offset /8 ), - &bitmap_entry,1 ); + &bitmap_entry,1 ,0 );if (ret <0 ) {return ret; }
block/cloop.c +5 -5
@@ -78,7 +78,7 @@ static int cloop_open(BlockDriverState *bs, QDict *options, int flags, }/* read header */ - ret =bdrv_pread (bs->file,128 , &s->block_size,4 ); + ret =bdrv_pread (bs->file,128 , &s->block_size,4 ,0 );if (ret <0 ) {return ret; }
@@ -104,7 +104,7 @@ static int cloop_open(BlockDriverState *bs, QDict *options, int flags,return -EINVAL ; } - ret =bdrv_pread (bs->file,128 +4 , &s->n_blocks,4 ); + ret =bdrv_pread (bs->file,128 +4 , &s->n_blocks,4 ,0 );if (ret <0 ) {return ret; }
@@ -135,7 +135,7 @@ static int cloop_open(BlockDriverState *bs, QDict *options, int flags,return -ENOMEM ; } - ret =bdrv_pread (bs->file,128 +4 +4 , s->offsets, offsets_size); + ret =bdrv_pread (bs->file,128 +4 +4 , s->offsets, offsets_size,0 );if (ret <0 ) { goto fail; }
@@ -220,8 +220,8 @@ static inline int cloop_read_block(BlockDriverState *bs, int block_num)int ret;uint32_t bytes = s->offsets[block_num +1 ] - s->offsets[block_num]; - ret =bdrv_pread (bs->file, s->offsets[block_num], - s->compressed_block, bytes); + ret =bdrv_pread (bs->file, s->offsets[block_num], s->compressed_block, + bytes,0 );if (ret != bytes) {return -1 ; }
block/crypto.c +2 -2
@@ -65,7 +65,7 @@ static ssize_t block_crypto_read_func(QCryptoBlock *block,BlockDriverState *bs = opaque;ssize_t ret; - ret =bdrv_pread (bs->file, offset, buf, buflen); + ret =bdrv_pread (bs->file, offset, buf, buflen,0 );if (ret <0 ) {error_setg_errno (errp, -ret,"Could not read encryption header" );return ret;
@@ -83,7 +83,7 @@ static ssize_t block_crypto_write_func(QCryptoBlock *block,BlockDriverState *bs = opaque;ssize_t ret; - ret =bdrv_pwrite (bs->file, offset, buf, buflen); + ret =bdrv_pwrite (bs->file, offset, buf, buflen,0 );if (ret <0 ) {error_setg_errno (errp, -ret,"Could not write encryption header" );return ret;
block/dmg.c +12 -12
@@ -77,7 +77,7 @@ static int read_uint64(BlockDriverState *bs, int64_t offset, uint64_t *result)uint64_t buffer;int ret; - ret =bdrv_pread (bs->file, offset, &buffer,8 ); + ret =bdrv_pread (bs->file, offset, &buffer,8 ,0 );if (ret <0 ) {return ret; }
@@ -91,7 +91,7 @@ static int read_uint32(BlockDriverState *bs, int64_t offset, uint32_t *result)uint32_t buffer;int ret; - ret =bdrv_pread (bs->file, offset, &buffer,4 ); + ret =bdrv_pread (bs->file, offset, &buffer,4 ,0 );if (ret <0 ) {return ret; }
@@ -172,7 +172,7 @@ static int64_t dmg_find_koly_offset(BdrvChild *file, Error **errp) offset = length -511 -512 ; } length = length <515 ? length :515 ; - ret =bdrv_pread (file, offset, buffer, length); + ret =bdrv_pread (file, offset, buffer, length,0 );if (ret <0 ) {error_setg_errno (errp, -ret,"Failed while reading UDIF trailer" );return ret;
@@ -352,7 +352,7 @@ static int dmg_read_resource_fork(BlockDriverState *bs, DmgHeaderState *ds, offset +=4 ; buffer =g_realloc (buffer, count); - ret =bdrv_pread (bs->file, offset, buffer, count); + ret =bdrv_pread (bs->file, offset, buffer, count,0 );if (ret <0 ) { goto fail; }
@@ -389,7 +389,7 @@ static int dmg_read_plist_xml(BlockDriverState *bs, DmgHeaderState *ds, buffer =g_malloc (info_length +1 ); buffer[info_length] ='\0' ; - ret =bdrv_pread (bs->file, info_begin, buffer, info_length); + ret =bdrv_pread (bs->file, info_begin, buffer, info_length,0 );if (ret != info_length) { ret = -EINVAL ; goto fail;
@@ -609,8 +609,8 @@ static inline int dmg_read_chunk(BlockDriverState *bs, uint64_t sector_num)case UDZO : {/* zlib compressed */ /* we need to buffer, because only the chunk as whole can be * inflated. */ - ret =bdrv_pread (bs->file, s->offsets[chunk], - s->compressed_chunk, s->lengths[chunk]); + ret =bdrv_pread (bs->file, s->offsets[chunk], s->compressed_chunk, + s->lengths[chunk],0 );if (ret != s->lengths[chunk]) {return -1 ; }
@@ -635,8 +635,8 @@ static inline int dmg_read_chunk(BlockDriverState *bs, uint64_t sector_num) }/* we need to buffer, because only the chunk as whole can be * inflated. */ - ret =bdrv_pread (bs->file, s->offsets[chunk], - s->compressed_chunk, s->lengths[chunk]); + ret =bdrv_pread (bs->file, s->offsets[chunk], s->compressed_chunk, + s->lengths[chunk],0 );if (ret != s->lengths[chunk]) {return -1 ; }
@@ -656,8 +656,8 @@ static inline int dmg_read_chunk(BlockDriverState *bs, uint64_t sector_num) }/* we need to buffer, because only the chunk as whole can be * inflated. */ - ret =bdrv_pread (bs->file, s->offsets[chunk], - s->compressed_chunk, s->lengths[chunk]); + ret =bdrv_pread (bs->file, s->offsets[chunk], s->compressed_chunk, + s->lengths[chunk],0 );if (ret != s->lengths[chunk]) {return -1 ; }
@@ -673,7 +673,7 @@ static inline int dmg_read_chunk(BlockDriverState *bs, uint64_t sector_num)break ;case UDRW :/* copy */ ret =bdrv_pread (bs->file, s->offsets[chunk], - s->uncompressed_chunk, s->lengths[chunk]); + s->uncompressed_chunk, s->lengths[chunk],0 );if (ret != s->lengths[chunk]) {return -1 ; }
block/io.c +7 -6
@@ -1112,7 +1112,8 @@ int bdrv_make_zero(BdrvChild *child, BdrvRequestFlags flags) }/* See bdrv_pwrite() for the return codes */ -int bdrv_pread (BdrvChild *child,int64_t offset,void *buf,int64_t bytes) +int bdrv_pread (BdrvChild *child,int64_t offset,void *buf,int64_t bytes, +BdrvRequestFlags flags) {int ret;QEMUIOVector qiov =QEMU_IOVEC_INIT_BUF (qiov, buf, bytes);
@@ -1122,7 +1123,7 @@ int bdrv_pread(BdrvChild *child, int64_t offset, void *buf, int64_t bytes)return -EINVAL ; } - ret =bdrv_preadv (child, offset, bytes, &qiov,0 ); + ret =bdrv_preadv (child, offset, bytes, &qiov, flags);return ret <0 ? ret : bytes; }
@@ -1134,7 +1135,7 @@ int bdrv_pread(BdrvChild *child, int64_t offset, void *buf, int64_t bytes)-EACCES Trying to write a read-only device */ int bdrv_pwrite (BdrvChild *child,int64_t offset,const void *buf, -int64_t bytes) +int64_t bytes,BdrvRequestFlags flags) {int ret;QEMUIOVector qiov =QEMU_IOVEC_INIT_BUF (qiov, buf, bytes);
@@ -1144,7 +1145,7 @@ int bdrv_pwrite(BdrvChild *child, int64_t offset, const void *buf,return -EINVAL ; } - ret =bdrv_pwritev (child, offset, bytes, &qiov,0 ); + ret =bdrv_pwritev (child, offset, bytes, &qiov, flags);return ret <0 ? ret : bytes; }
@@ -1156,12 +1157,12 @@ int bdrv_pwrite(BdrvChild *child, int64_t offset, const void *buf,* Returns 0 on success, -errno in error cases. */ int bdrv_pwrite_sync (BdrvChild *child,int64_t offset, -const void *buf,int64_t count) +const void *buf,int64_t count,BdrvRequestFlags flags) {int ret;IO_CODE (); - ret =bdrv_pwrite (child, offset, buf, count); + ret =bdrv_pwrite (child, offset, buf, count, flags);if (ret <0 ) {return ret; }
block/parallels-ext.c +2 -2
@@ -94,7 +94,7 @@ static int parallels_load_bitmap_data(BlockDriverState *bs,bdrv_dirty_bitmap_deserialize_ones (bitmap, offset, count, false); }else { ret =bdrv_pread (bs->file, entry <<BDRV_SECTOR_BITS , buf, - s->cluster_size); + s->cluster_size,0 );if (ret <0 ) {error_setg_errno (errp, -ret,"Failed to read bitmap data cluster" );
@@ -286,7 +286,7 @@ int parallels_read_format_extension(BlockDriverState *bs,assert (ext_off >0 ); - ret =bdrv_pread (bs->file, ext_off, ext_cluster, s->cluster_size); + ret =bdrv_pread (bs->file, ext_off, ext_cluster, s->cluster_size,0 );if (ret <0 ) {error_setg_errno (errp, -ret,"Failed to read Format Extension cluster" ); goto out;
block/parallels.c +6 -6
@@ -277,8 +277,8 @@ static coroutine_fn int parallels_co_flush_to_os(BlockDriverState *bs)if (off + to_write > s->header_size) { to_write = s->header_size - off; } - ret =bdrv_pwrite (bs->file, off, (uint8_t *)s->header + off, - to_write); + ret =bdrv_pwrite (bs->file, off, (uint8_t *)s->header + off, to_write, +0 );if (ret <0 ) {qemu_co_mutex_unlock (&s->lock);return ret;
@@ -481,7 +481,7 @@ static int coroutine_fn parallels_co_check(BlockDriverState *bs, ret =0 ;if (flush_bat) { - ret =bdrv_pwrite_sync (bs->file,0 , s->header, s->header_size); + ret =bdrv_pwrite_sync (bs->file,0 , s->header, s->header_size,0 );if (ret <0 ) { res->check_errors++; goto out;
@@ -723,7 +723,7 @@ static int parallels_update_header(BlockDriverState *bs)if (size > s->header_size) { size = s->header_size; } -return bdrv_pwrite_sync (bs->file,0 , s->header, size); +return bdrv_pwrite_sync (bs->file,0 , s->header, size,0 ); } static int parallels_open(BlockDriverState *bs, QDict *options, int flags,
@@ -742,7 +742,7 @@ static int parallels_open(BlockDriverState *bs, QDict *options, int flags,return -EINVAL ; } - ret =bdrv_pread (bs->file,0 , &ph,sizeof (ph)); + ret =bdrv_pread (bs->file,0 , &ph,sizeof (ph),0 );if (ret <0 ) { goto fail; }
@@ -798,7 +798,7 @@ static int parallels_open(BlockDriverState *bs, QDict *options, int flags, s->header_size = size; } - ret =bdrv_pread (bs->file,0 , s->header, s->header_size); + ret =bdrv_pread (bs->file,0 , s->header, s->header_size,0 );if (ret <0 ) { goto fail; }
block/qcow.c +13 -14
@@ -128,7 +128,7 @@ static int qcow_open(BlockDriverState *bs, QDict *options, int flags, goto fail; } - ret =bdrv_pread (bs->file,0 , &header,sizeof (header)); + ret =bdrv_pread (bs->file,0 , &header,sizeof (header),0 );if (ret <0 ) { goto fail; }
@@ -261,7 +261,7 @@ static int qcow_open(BlockDriverState *bs, QDict *options, int flags, } ret =bdrv_pread (bs->file, s->l1_table_offset, s->l1_table, - s->l1_size *sizeof (uint64_t )); + s->l1_size *sizeof (uint64_t ),0 );if (ret <0 ) { goto fail; }
@@ -292,7 +292,7 @@ static int qcow_open(BlockDriverState *bs, QDict *options, int flags, goto fail; } ret =bdrv_pread (bs->file, header.backing_file_offset, - bs->auto_backing_file, len); + bs->auto_backing_file, len,0 );if (ret <0 ) { goto fail; }
@@ -383,7 +383,7 @@ static int get_cluster_offset(BlockDriverState *bs,BLKDBG_EVENT (bs->file,BLKDBG_L1_UPDATE ); ret =bdrv_pwrite_sync (bs->file, s->l1_table_offset + l1_index *sizeof (tmp), - &tmp,sizeof (tmp)); + &tmp,sizeof (tmp),0 );if (ret <0 ) {return ret; }
@@ -415,13 +415,13 @@ static int get_cluster_offset(BlockDriverState *bs,if (new_l2_table) {memset (l2_table,0 , s->l2_size *sizeof (uint64_t )); ret =bdrv_pwrite_sync (bs->file, l2_offset, l2_table, - s->l2_size *sizeof (uint64_t )); + s->l2_size *sizeof (uint64_t ),0 );if (ret <0 ) {return ret; } }else { ret =bdrv_pread (bs->file, l2_offset, l2_table, - s->l2_size *sizeof (uint64_t )); + s->l2_size *sizeof (uint64_t ),0 );if (ret <0 ) {return ret; }
@@ -454,7 +454,7 @@ static int get_cluster_offset(BlockDriverState *bs,/* write the cluster content */ BLKDBG_EVENT (bs->file,BLKDBG_WRITE_AIO ); ret =bdrv_pwrite (bs->file, cluster_offset, s->cluster_cache, - s->cluster_size); + s->cluster_size,0 );if (ret <0 ) {return ret; }
@@ -492,10 +492,9 @@ static int get_cluster_offset(BlockDriverState *bs,return -EIO ; }BLKDBG_EVENT (bs->file,BLKDBG_WRITE_AIO ); - ret =bdrv_pwrite (bs->file, - cluster_offset + i, + ret =bdrv_pwrite (bs->file, cluster_offset + i, s->cluster_data, -BDRV_SECTOR_SIZE ); +BDRV_SECTOR_SIZE ,0 );if (ret <0 ) {return ret; }
@@ -516,7 +515,7 @@ static int get_cluster_offset(BlockDriverState *bs,BLKDBG_EVENT (bs->file,BLKDBG_L2_UPDATE ); } ret =bdrv_pwrite_sync (bs->file, l2_offset + l2_index *sizeof (tmp), - &tmp,sizeof (tmp)); + &tmp,sizeof (tmp),0 );if (ret <0 ) {return ret; }
@@ -597,7 +596,7 @@ static int decompress_cluster(BlockDriverState *bs, uint64_t cluster_offset) csize = cluster_offset >> (63 - s->cluster_bits); csize &= (s->cluster_size -1 );BLKDBG_EVENT (bs->file,BLKDBG_READ_COMPRESSED ); - ret =bdrv_pread (bs->file, coffset, s->cluster_data, csize); + ret =bdrv_pread (bs->file, coffset, s->cluster_data, csize,0 );if (ret != csize)return -1 ; if (decompress_buffer(s->cluster_cache, s->cluster_size,
@@ -1030,8 +1029,8 @@ static int qcow_make_empty(BlockDriverState *bs)int ret;memset (s->l1_table,0 , l1_length); -if (bdrv_pwrite_sync (bs->file, s->l1_table_offset, s->l1_table, - l1_length) <0 ) +if (bdrv_pwrite_sync (bs->file, s->l1_table_offset, s->l1_table, l1_length, +0 ) <0 )return -1 ; ret =bdrv_truncate (bs->file, s->l1_table_offset + l1_length, false,PREALLOC_MODE_OFF ,0 ,NULL );
block/qcow2-bitmap.c +7 -7
@@ -234,8 +234,8 @@ static int bitmap_table_load(BlockDriverState *bs, Qcow2BitmapTable *tb, }assert (tb->size <=BME_MAX_TABLE_SIZE ); - ret =bdrv_pread (bs->file, tb->offset, - table, tb->size *BME_TABLE_ENTRY_SIZE ); + ret =bdrv_pread (bs->file, tb->offset, table, + tb->size *BME_TABLE_ENTRY_SIZE ,0 );if (ret <0 ) { goto fail; }
@@ -317,7 +317,7 @@ static int load_bitmap_data(BlockDriverState *bs,* already cleared */ } }else { - ret =bdrv_pread (bs->file, data_offset, buf, s->cluster_size); + ret =bdrv_pread (bs->file, data_offset, buf, s->cluster_size,0 );if (ret <0 ) { goto finish; }
@@ -575,7 +575,7 @@ static Qcow2BitmapList *bitmap_list_load(BlockDriverState *bs, uint64_t offset, } dir_end = dir + size; - ret =bdrv_pread (bs->file, offset, dir, size); + ret =bdrv_pread (bs->file, offset, dir, size,0 );if (ret <0 ) {error_setg_errno (errp, -ret,"Failed to read bitmap directory" ); goto fail;
@@ -798,7 +798,7 @@ static int bitmap_list_store(BlockDriverState *bs, Qcow2BitmapList *bm_list, goto fail; } - ret =bdrv_pwrite (bs->file, dir_offset, dir, dir_size); + ret =bdrv_pwrite (bs->file, dir_offset, dir, dir_size,0 );if (ret <0 ) { goto fail; }
@@ -1339,7 +1339,7 @@ static uint64_t *store_bitmap_data(BlockDriverState *bs, goto fail; } - ret =bdrv_pwrite (bs->file, off, buf, s->cluster_size); + ret =bdrv_pwrite (bs->file, off, buf, s->cluster_size,0 );if (ret <0 ) {error_setg_errno (errp, -ret,"Failed to write bitmap '%s' to file" , bm_name);
@@ -1402,7 +1402,7 @@ static int store_bitmap(BlockDriverState *bs, Qcow2Bitmap *bm, Error **errp) }bitmap_table_to_be (tb, tb_size); - ret =bdrv_pwrite (bs->file, tb_offset, tb, tb_size *sizeof (tb[0 ])); + ret =bdrv_pwrite (bs->file, tb_offset, tb, tb_size *sizeof (tb[0 ]),0 );if (ret <0 ) {error_setg_errno (errp, -ret,"Failed to write bitmap '%s' to file" , bm_name);
block/qcow2-cache.c +3 -4
@@ -224,7 +224,7 @@ static int qcow2_cache_entry_flush(BlockDriverState *bs, Qcow2Cache *c, int i) } ret =bdrv_pwrite (bs->file, c->entries[i].offset, -qcow2_cache_get_table_addr (c, i), c->table_size); +qcow2_cache_get_table_addr (c, i), c->table_size,0 );if (ret <0 ) {return ret; }
@@ -379,9 +379,8 @@ static int qcow2_cache_do_get(BlockDriverState *bs, Qcow2Cache *c,BLKDBG_EVENT (bs->file,BLKDBG_L2_LOAD ); } - ret =bdrv_pread (bs->file, offset, -qcow2_cache_get_table_addr (c, i), - c->table_size); + ret =bdrv_pread (bs->file, offset,qcow2_cache_get_table_addr (c, i), + c->table_size,0 );if (ret <0 ) {return ret; }
block/qcow2-cluster.c +11 -10
@@ -159,8 +159,8 @@ int qcow2_grow_l1_table(BlockDriverState *bs, uint64_t min_size,BLKDBG_EVENT (bs->file,BLKDBG_L1_GROW_WRITE_TABLE );for (i =0 ; i < s->l1_size; i++) new_l1_table[i] =cpu_to_be64 (new_l1_table[i]); - ret =bdrv_pwrite_sync (bs->file, new_l1_table_offset, - new_l1_table, new_l1_size2); + ret =bdrv_pwrite_sync (bs->file, new_l1_table_offset, new_l1_table, + new_l1_size2,0 );if (ret <0 ) goto fail;for (i =0 ; i < s->l1_size; i++)
@@ -170,8 +170,8 @@ int qcow2_grow_l1_table(BlockDriverState *bs, uint64_t min_size,BLKDBG_EVENT (bs->file,BLKDBG_L1_GROW_ACTIVATE_TABLE );stl_be_p (data, new_l1_size);stq_be_p (data +4 , new_l1_table_offset); - ret =bdrv_pwrite_sync (bs->file, offsetof(QCowHeader , l1_size), - data,sizeof (data)); + ret =bdrv_pwrite_sync (bs->file, offsetof(QCowHeader , l1_size), data, +sizeof (data),0 );if (ret <0 ) { goto fail; }
@@ -249,7 +249,7 @@ int qcow2_write_l1_entry(BlockDriverState *bs, int l1_index)BLKDBG_EVENT (bs->file,BLKDBG_L1_UPDATE ); ret =bdrv_pwrite_sync (bs->file, s->l1_table_offset +L1E_SIZE * l1_start_index, - buf, bufsize); + buf, bufsize,0 );if (ret <0 ) {return ret; }
@@ -2260,7 +2260,8 @@ static int expand_zero_clusters_in_l1(BlockDriverState *bs, uint64_t *l1_table, (void **)&l2_slice); }else {/* load inactive L2 tables from disk */ - ret =bdrv_pread (bs->file, slice_offset, l2_slice, slice_size2); + ret =bdrv_pread (bs->file, slice_offset, l2_slice, + slice_size2,0 ); }if (ret <0 ) { goto fail;
@@ -2376,8 +2377,8 @@ static int expand_zero_clusters_in_l1(BlockDriverState *bs, uint64_t *l1_table, goto fail; } - ret =bdrv_pwrite (bs->file, slice_offset, - l2_slice, slice_size2); + ret =bdrv_pwrite (bs->file, slice_offset, l2_slice, + slice_size2,0 );if (ret <0 ) { goto fail; }
@@ -2470,8 +2471,8 @@ int qcow2_expand_zero_clusters(BlockDriverState *bs, l1_table = new_l1_table; - ret =bdrv_pread (bs->file, s->snapshots[i].l1_table_offset, - l1_table, l1_size2); + ret =bdrv_pread (bs->file, s->snapshots[i].l1_table_offset, l1_table, + l1_size2,0 );if (ret <0 ) { goto fail; }
block/qcow2-refcount.c +21 -21
150 lines not on this page · raw message
block/qcow2-snapshot.c +20 -19
@@ -108,7 +108,7 @@ static int qcow2_do_read_snapshots(BlockDriverState *bs, bool repair,/* Read statically sized part of the snapshot header */ offset =ROUND_UP (offset,8 ); - ret =bdrv_pread (bs->file, offset, &h,sizeof (h)); + ret =bdrv_pread (bs->file, offset, &h,sizeof (h),0 );if (ret <0 ) {error_setg_errno (errp, -ret,"Failed to read snapshot table" ); goto fail;
@@ -147,7 +147,7 @@ static int qcow2_do_read_snapshots(BlockDriverState *bs, bool repair,/* Read known extra data */ ret =bdrv_pread (bs->file, offset, &extra, -MIN (sizeof (extra), sn->extra_data_size)); +MIN (sizeof (extra), sn->extra_data_size),0 );if (ret <0 ) {error_setg_errno (errp, -ret,"Failed to read snapshot table" ); goto fail;
@@ -185,7 +185,7 @@ static int qcow2_do_read_snapshots(BlockDriverState *bs, bool repair, unknown_extra_data_size = sn->extra_data_size -sizeof (extra); sn->unknown_extra_data =g_malloc (unknown_extra_data_size); ret =bdrv_pread (bs->file, offset, sn->unknown_extra_data, - unknown_extra_data_size); + unknown_extra_data_size,0 );if (ret <0 ) {error_setg_errno (errp, -ret,"Failed to read snapshot table" );
@@ -196,7 +196,7 @@ static int qcow2_do_read_snapshots(BlockDriverState *bs, bool repair,/* Read snapshot ID */ sn->id_str =g_malloc (id_str_size +1 ); - ret =bdrv_pread (bs->file, offset, sn->id_str, id_str_size); + ret =bdrv_pread (bs->file, offset, sn->id_str, id_str_size,0 );if (ret <0 ) {error_setg_errno (errp, -ret,"Failed to read snapshot table" ); goto fail;
@@ -206,7 +206,7 @@ static int qcow2_do_read_snapshots(BlockDriverState *bs, bool repair,/* Read snapshot name */ sn->name =g_malloc (name_size +1 ); - ret =bdrv_pread (bs->file, offset, sn->name, name_size); + ret =bdrv_pread (bs->file, offset, sn->name, name_size,0 );if (ret <0 ) {error_setg_errno (errp, -ret,"Failed to read snapshot table" ); goto fail;
@@ -349,13 +349,13 @@ int qcow2_write_snapshots(BlockDriverState *bs) h.name_size =cpu_to_be16 (name_size); offset =ROUND_UP (offset,8 ); - ret =bdrv_pwrite (bs->file, offset, &h,sizeof (h)); + ret =bdrv_pwrite (bs->file, offset, &h,sizeof (h),0 );if (ret <0 ) { goto fail; } offset +=sizeof (h); - ret =bdrv_pwrite (bs->file, offset, &extra,sizeof (extra)); + ret =bdrv_pwrite (bs->file, offset, &extra,sizeof (extra),0 );if (ret <0 ) { goto fail; }
@@ -370,20 +370,20 @@ int qcow2_write_snapshots(BlockDriverState *bs)assert (sn->unknown_extra_data); ret =bdrv_pwrite (bs->file, offset, sn->unknown_extra_data, - unknown_extra_data_size); + unknown_extra_data_size,0 );if (ret <0 ) { goto fail; } offset += unknown_extra_data_size; } - ret =bdrv_pwrite (bs->file, offset, sn->id_str, id_str_size); + ret =bdrv_pwrite (bs->file, offset, sn->id_str, id_str_size,0 );if (ret <0 ) { goto fail; } offset += id_str_size; - ret =bdrv_pwrite (bs->file, offset, sn->name, name_size); + ret =bdrv_pwrite (bs->file, offset, sn->name, name_size,0 );if (ret <0 ) { goto fail; }
@@ -406,7 +406,7 @@ int qcow2_write_snapshots(BlockDriverState *bs) header_data.snapshots_offset =cpu_to_be64 (snapshots_offset); ret =bdrv_pwrite_sync (bs->file, offsetof(QCowHeader , nb_snapshots), - &header_data,sizeof (header_data)); + &header_data,sizeof (header_data),0 );if (ret <0 ) { goto fail; }
@@ -442,7 +442,8 @@ int coroutine_fn qcow2_check_read_snapshot_table(BlockDriverState *bs,/* qcow2_do_open() discards this information in check mode */ ret =bdrv_pread (bs->file, offsetof(QCowHeader , nb_snapshots), - &snapshot_table_pointer,sizeof (snapshot_table_pointer)); + &snapshot_table_pointer,sizeof (snapshot_table_pointer), +0 );if (ret <0 ) { result->check_errors++; fprintf(stderr, "ERROR failed to read the snapshot table pointer from "
@@ -513,7 +514,7 @@ int coroutine_fn qcow2_check_read_snapshot_table(BlockDriverState *bs, snapshot_table_pointer.nb_snapshots =cpu_to_be32 (s->nb_snapshots); ret =bdrv_pwrite_sync (bs->file, offsetof(QCowHeader , nb_snapshots), &snapshot_table_pointer.nb_snapshots, -sizeof (snapshot_table_pointer.nb_snapshots)); +sizeof (snapshot_table_pointer.nb_snapshots),0 );if (ret <0 ) { result->check_errors++; fprintf(stderr, "ERROR failed to update the snapshot count in the "
@@ -694,7 +695,7 @@ int qcow2_snapshot_create(BlockDriverState *bs, QEMUSnapshotInfo *sn_info) } ret =bdrv_pwrite (bs->file, sn->l1_table_offset, l1_table, - s->l1_size *L1E_SIZE ); + s->l1_size *L1E_SIZE ,0 );if (ret <0 ) { goto fail; }
@@ -829,8 +830,8 @@ int qcow2_snapshot_goto(BlockDriverState *bs, const char *snapshot_id) goto fail; } - ret =bdrv_pread (bs->file, sn->l1_table_offset, - sn_l1_table, sn_l1_bytes); + ret =bdrv_pread (bs->file, sn->l1_table_offset, sn_l1_table, sn_l1_bytes, +0 );if (ret <0 ) { goto fail; }
@@ -849,7 +850,7 @@ int qcow2_snapshot_goto(BlockDriverState *bs, const char *snapshot_id) } ret =bdrv_pwrite_sync (bs->file, s->l1_table_offset, sn_l1_table, - cur_l1_bytes); + cur_l1_bytes,0 );if (ret <0 ) { goto fail; }
@@ -1051,8 +1052,8 @@ int qcow2_snapshot_load_tmp(BlockDriverState *bs,return -ENOMEM ; } - ret =bdrv_pread (bs->file, sn->l1_table_offset, - new_l1_table, new_l1_bytes); + ret =bdrv_pread (bs->file, sn->l1_table_offset, new_l1_table, + new_l1_bytes,0 );if (ret <0 ) {error_setg (errp,"Failed to read l1 table for snapshot" );qemu_vfree (new_l1_table);
block/qcow2.c +22 -22
152 lines not on this page · raw message
block/qed.c +4 -4
@@ -90,7 +90,7 @@ int qed_write_header_sync(BDRVQEDState *s)int ret;qed_header_cpu_to_le (&s->header, &le); - ret =bdrv_pwrite (s->bs->file,0 , &le,sizeof (le)); + ret =bdrv_pwrite (s->bs->file,0 , &le,sizeof (le),0 );if (ret !=sizeof (le)) {return ret; }
@@ -207,7 +207,7 @@ static int qed_read_string(BdrvChild *file, uint64_t offset, size_t n,if (n >= buflen) {return -EINVAL ; } - ret =bdrv_pread (file, offset, buf, n); + ret =bdrv_pread (file, offset, buf, n,0 );if (ret <0 ) {return ret; }
@@ -392,7 +392,7 @@ static int coroutine_fn bdrv_qed_do_open(BlockDriverState *bs, QDict *options,int64_t file_size;int ret; - ret =bdrv_pread (bs->file,0 , &le_header,sizeof (le_header)); + ret =bdrv_pread (bs->file,0 , &le_header,sizeof (le_header),0 );if (ret <0 ) {error_setg (errp,"Failed to read QED header" );return ret;
@@ -1545,7 +1545,7 @@ static int bdrv_qed_change_backing_file(BlockDriverState *bs, }/* Write new header */ - ret =bdrv_pwrite_sync (bs->file,0 , buffer, buffer_len); + ret =bdrv_pwrite_sync (bs->file,0 , buffer, buffer_len,0 );g_free (buffer);if (ret ==0 ) {memcpy (&s->header, &new_header,sizeof (new_header));
block/vdi.c +5 -5
@@ -385,7 +385,7 @@ static int vdi_open(BlockDriverState *bs, QDict *options, int flags,logout ("\n" ); - ret =bdrv_pread (bs->file,0 , &header,sizeof (header)); + ret =bdrv_pread (bs->file,0 , &header,sizeof (header),0 );if (ret <0 ) { goto fail; }
@@ -486,7 +486,7 @@ static int vdi_open(BlockDriverState *bs, QDict *options, int flags, } ret =bdrv_pread (bs->file, header.offset_bmap, s->bmap, - bmap_size *SECTOR_SIZE ); + bmap_size *SECTOR_SIZE ,0 );if (ret <0 ) { goto fail_free_bmap; }
@@ -664,7 +664,7 @@ vdi_co_pwritev(BlockDriverState *bs, int64_t offset, int64_t bytes,* so this full-cluster write does not overlap a partial write * of the same cluster, issued from the "else" branch. */ - ret =bdrv_pwrite (bs->file, data_offset, block, s->block_size); + ret =bdrv_pwrite (bs->file, data_offset, block, s->block_size,0 );qemu_co_rwlock_unlock (&s->bmap_lock); }else { nonallocating_write:
@@ -709,7 +709,7 @@ nonallocating_write:assert (VDI_IS_ALLOCATED (bmap_first)); *header = s->header;vdi_header_to_le (header); - ret =bdrv_pwrite (bs->file,0 , header,sizeof (*header)); + ret =bdrv_pwrite (bs->file,0 , header,sizeof (*header),0 );g_free (header);if (ret <0 ) {
@@ -727,7 +727,7 @@ nonallocating_write:logout ("will write %u block map sectors starting from entry %u\n" , n_sectors, bmap_first); ret =bdrv_pwrite (bs->file, offset *SECTOR_SIZE , base, - n_sectors *SECTOR_SIZE ); + n_sectors *SECTOR_SIZE ,0 ); }return ret <0 ? ret :0 ;
block/vhdx-log.c +9 -10
@@ -84,7 +84,7 @@ static int vhdx_log_peek_hdr(BlockDriverState *bs, VHDXLogEntries *log, offset = log->offset + read; - ret =bdrv_pread (bs->file, offset, hdr,sizeof (VHDXLogEntryHeader)); + ret =bdrv_pread (bs->file, offset, hdr,sizeof (VHDXLogEntryHeader),0 );if (ret <0 ) { goto exit; }
@@ -144,7 +144,7 @@ static int vhdx_log_read_sectors(BlockDriverState *bs, VHDXLogEntries *log, } offset = log->offset + read; - ret =bdrv_pread (bs->file, offset, buffer,VHDX_LOG_SECTOR_SIZE ); + ret =bdrv_pread (bs->file, offset, buffer,VHDX_LOG_SECTOR_SIZE ,0 );if (ret <0 ) { goto exit; }
@@ -194,8 +194,8 @@ static int vhdx_log_write_sectors(BlockDriverState *bs, VHDXLogEntries *log,/* full */ break ; } - ret =bdrv_pwrite (bs->file, offset, buffer_tmp, -VHDX_LOG_SECTOR_SIZE ); + ret =bdrv_pwrite (bs->file, offset, buffer_tmp,VHDX_LOG_SECTOR_SIZE , +0 );if (ret <0 ) { goto exit; }
@@ -467,7 +467,7 @@ static int vhdx_log_flush_desc(BlockDriverState *bs, VHDXLogDescriptor *desc,/* count is only > 1 if we are writing zeroes */ for (i =0 ; i < count; i++) { ret =bdrv_pwrite_sync (bs->file, file_offset, buffer, -VHDX_LOG_SECTOR_SIZE ); +VHDX_LOG_SECTOR_SIZE ,0 );if (ret <0 ) { goto exit; }
@@ -971,7 +971,7 @@ static int vhdx_log_write(BlockDriverState *bs, BDRVVHDXState *s,if (i ==0 && leading_length) {/* partial sector at the front of the buffer */ ret =bdrv_pread (bs->file, file_offset, merged_sector, -VHDX_LOG_SECTOR_SIZE ); +VHDX_LOG_SECTOR_SIZE ,0 );if (ret <0 ) { goto exit; }
@@ -980,10 +980,9 @@ static int vhdx_log_write(BlockDriverState *bs, BDRVVHDXState *s, sector_write = merged_sector; }else if (i == sectors -1 && trailing_length) {/* partial sector at the end of the buffer */ - ret =bdrv_pread (bs->file, - file_offset, - merged_sector + trailing_length, -VHDX_LOG_SECTOR_SIZE - trailing_length); + ret =bdrv_pread (bs->file, file_offset, + merged_sector + trailing_length, +VHDX_LOG_SECTOR_SIZE - trailing_length,0 );if (ret <0 ) { goto exit; }
block/vhdx.c +18 -14
@@ -326,7 +326,7 @@ static int vhdx_write_header(BdrvChild *file, VHDXHeader *hdr, buffer =qemu_blockalign (bs_file,VHDX_HEADER_SIZE );if (read) {/* if true, we can't assume the extra reserved bytes are 0 */ - ret =bdrv_pread (file, offset, buffer,VHDX_HEADER_SIZE ); + ret =bdrv_pread (file, offset, buffer,VHDX_HEADER_SIZE ,0 );if (ret <0 ) { goto exit; }
@@ -340,7 +340,7 @@ static int vhdx_write_header(BdrvChild *file, VHDXHeader *hdr,vhdx_header_le_export (hdr, header_le);vhdx_update_checksum (buffer,VHDX_HEADER_SIZE , offsetof(VHDXHeader , checksum)); - ret =bdrv_pwrite_sync (file, offset, header_le,sizeof (VHDXHeader)); + ret =bdrv_pwrite_sync (file, offset, header_le,sizeof (VHDXHeader),0 ); exit:qemu_vfree (buffer);
@@ -440,8 +440,8 @@ static void vhdx_parse_header(BlockDriverState *bs, BDRVVHDXState *s,/* We have to read the whole VHDX_HEADER_SIZE instead of * sizeof(VHDXHeader), because the checksum is over the whole * region */ - ret =bdrv_pread (bs->file,VHDX_HEADER1_OFFSET , buffer, -VHDX_HEADER_SIZE ); + ret =bdrv_pread (bs->file,VHDX_HEADER1_OFFSET , buffer,VHDX_HEADER_SIZE , +0 );if (ret <0 ) { goto fail; }
@@ -457,8 +457,8 @@ static void vhdx_parse_header(BlockDriverState *bs, BDRVVHDXState *s, } } - ret =bdrv_pread (bs->file,VHDX_HEADER2_OFFSET , buffer, -VHDX_HEADER_SIZE ); + ret =bdrv_pread (bs->file,VHDX_HEADER2_OFFSET , buffer,VHDX_HEADER_SIZE , +0 );if (ret <0 ) { goto fail; }
@@ -532,7 +532,7 @@ static int vhdx_open_region_tables(BlockDriverState *bs, BDRVVHDXState *s) buffer =qemu_blockalign (bs,VHDX_HEADER_BLOCK_SIZE ); ret =bdrv_pread (bs->file,VHDX_REGION_TABLE_OFFSET , buffer, -VHDX_HEADER_BLOCK_SIZE ); +VHDX_HEADER_BLOCK_SIZE ,0 );if (ret <0 ) { goto fail; }
@@ -645,7 +645,7 @@ static int vhdx_parse_metadata(BlockDriverState *bs, BDRVVHDXState *s) buffer =qemu_blockalign (bs,VHDX_METADATA_TABLE_MAX_SIZE ); ret =bdrv_pread (bs->file, s->metadata_rt.file_offset, buffer, -VHDX_METADATA_TABLE_MAX_SIZE ); +VHDX_METADATA_TABLE_MAX_SIZE ,0 );if (ret <0 ) { goto exit; }
@@ -751,7 +751,8 @@ static int vhdx_parse_metadata(BlockDriverState *bs, BDRVVHDXState *s) s->metadata_entries.file_parameters_entry.offset + s->metadata_rt.file_offset, &s->params, - sizeof(s->params)); +sizeof (s->params), + 0);if (ret <0 ) { goto exit;
@@ -786,7 +787,8 @@ static int vhdx_parse_metadata(BlockDriverState *bs, BDRVVHDXState *s) s->metadata_entries.virtual_disk_size_entry.offset + s->metadata_rt.file_offset, &s->virtual_disk_size, - sizeof(uint64_t)); +sizeof (uint64_t ), + 0);if (ret <0 ) { goto exit; }
@@ -794,7 +796,8 @@ static int vhdx_parse_metadata(BlockDriverState *bs, BDRVVHDXState *s) s->metadata_entries.logical_sector_size_entry.offset + s->metadata_rt.file_offset, &s->logical_sector_size, - sizeof(uint32_t)); +sizeof (uint32_t ), + 0);if (ret <0 ) { goto exit; }
@@ -802,7 +805,8 @@ static int vhdx_parse_metadata(BlockDriverState *bs, BDRVVHDXState *s) s->metadata_entries.phys_sector_size_entry.offset + s->metadata_rt.file_offset, &s->physical_sector_size, - sizeof(uint32_t)); +sizeof (uint32_t ), + 0);if (ret <0 ) { goto exit; }
@@ -1010,7 +1014,7 @@ static int vhdx_open(BlockDriverState *bs, QDict *options, int flags,QLIST_INIT (&s->regions);/* validate the file signature */ - ret =bdrv_pread (bs->file,0 , &signature,sizeof (uint64_t )); + ret =bdrv_pread (bs->file,0 , &signature,sizeof (uint64_t ),0 );if (ret <0 ) { goto fail; }
@@ -1069,7 +1073,7 @@ static int vhdx_open(BlockDriverState *bs, QDict *options, int flags, goto fail; } - ret =bdrv_pread (bs->file, s->bat_offset, s->bat, s->bat_rt.length); + ret =bdrv_pread (bs->file, s->bat_offset, s->bat, s->bat_rt.length,0 );if (ret <0 ) { goto fail; }
block/vmdk.c +25 -32
177 lines not on this page · raw message
block/vpc.c +10 -9
@@ -252,7 +252,7 @@ static int vpc_open(BlockDriverState *bs, QDict *options, int flags, goto fail; } - ret =bdrv_pread (bs->file,0 , &s->footer,sizeof (s->footer)); + ret =bdrv_pread (bs->file,0 , &s->footer,sizeof (s->footer),0 );if (ret <0 ) {error_setg (errp,"Unable to read VHD header" ); goto fail;
@@ -272,8 +272,8 @@ static int vpc_open(BlockDriverState *bs, QDict *options, int flags, }/* If a fixed disk, the footer is found only at the end of the file */ - ret =bdrv_pread (bs->file, offset -sizeof (*footer), - footer,sizeof (*footer)); + ret =bdrv_pread (bs->file, offset -sizeof (*footer), footer, +sizeof (*footer),0 );if (ret <0 ) { goto fail; }
@@ -347,7 +347,7 @@ static int vpc_open(BlockDriverState *bs, QDict *options, int flags,if (disk_type ==VHD_DYNAMIC ) { ret =bdrv_pread (bs->file,be64_to_cpu (footer->data_offset), - &dyndisk_header,sizeof (dyndisk_header)); + &dyndisk_header,sizeof (dyndisk_header),0 );if (ret <0 ) {error_setg (errp,"Error reading dynamic VHD header" ); goto fail;
@@ -402,7 +402,7 @@ static int vpc_open(BlockDriverState *bs, QDict *options, int flags, s->bat_offset =be64_to_cpu (dyndisk_header.table_offset); ret =bdrv_pread (bs->file, s->bat_offset, s->pagetable, - pagetable_size); + pagetable_size,0 );if (ret <0 ) {error_setg (errp,"Error reading pagetable" ); goto fail;
@@ -516,7 +516,8 @@ static inline int64_t get_image_offset(BlockDriverState *bs, uint64_t offset, s->last_bitmap_offset = bitmap_offset;memset (bitmap,0xff , s->bitmap_size); - r =bdrv_pwrite_sync (bs->file, bitmap_offset, bitmap, s->bitmap_size); + r =bdrv_pwrite_sync (bs->file, bitmap_offset, bitmap, s->bitmap_size, +0 );if (r <0 ) { *err = r;return -2 ;
@@ -538,7 +539,7 @@ static int rewrite_footer(BlockDriverState *bs)BDRVVPCState *s = bs->opaque;int64_t offset = s->free_data_block_offset; - ret =bdrv_pwrite_sync (bs->file, offset, &s->footer,sizeof (s->footer)); + ret =bdrv_pwrite_sync (bs->file, offset, &s->footer,sizeof (s->footer),0 );if (ret <0 )return ret;
@@ -573,7 +574,7 @@ static int64_t alloc_block(BlockDriverState *bs, int64_t offset)/* Initialize the block's bitmap */ memset (bitmap,0xff , s->bitmap_size); ret =bdrv_pwrite_sync (bs->file, s->free_data_block_offset, bitmap, - s->bitmap_size); + s->bitmap_size,0 );if (ret <0 ) {return ret; }
@@ -587,7 +588,7 @@ static int64_t alloc_block(BlockDriverState *bs, int64_t offset)/* Write BAT entry to disk */ bat_offset = s->bat_offset + (4 * index); bat_value =cpu_to_be32 (s->pagetable[index]); - ret =bdrv_pwrite_sync (bs->file, bat_offset, &bat_value,4 ); + ret =bdrv_pwrite_sync (bs->file, bat_offset, &bat_value,4 ,0 );if (ret <0 ) goto fail;
block/vvfat.c +4 -3
@@ -1489,7 +1489,7 @@ static int vvfat_read(BlockDriverState *bs, int64_t sector_num," allocated\n" , sector_num, n >> BDRV_SECTOR_BITS));if (bdrv_pread (s->qcow, sector_num *BDRV_SECTOR_SIZE , - buf + i *0x200 , n) <0 ) { + buf + i *0x200 , n,0 ) <0 ) {return -1 ; } i += (n >>BDRV_SECTOR_BITS ) -1 ;
@@ -1978,7 +1978,8 @@ static uint32_t get_cluster_count_for_direntry(BDRVVVFATState* s,return -1 ; } res =bdrv_pwrite (s->qcow, offset *BDRV_SECTOR_SIZE , - s->cluster_buffer,BDRV_SECTOR_SIZE ); + s->cluster_buffer,BDRV_SECTOR_SIZE , +0 );if (res <0 ) {return -2 ; }
@@ -3063,7 +3064,7 @@ DLOG(checkpoint());*/ DLOG (fprintf (stderr,"Write to qcow backend: %d + %d\n" , (int )sector_num, nb_sectors)); ret =bdrv_pwrite (s->qcow, sector_num *BDRV_SECTOR_SIZE , buf, - nb_sectors *BDRV_SECTOR_SIZE ); + nb_sectors *BDRV_SECTOR_SIZE ,0 );if (ret <0 ) {fprintf (stderr,"Error writing to qcow backend\n" );return ret;
include/block/block-io.h +4 -3
@@ -42,11 +42,12 @@int bdrv_pwrite_zeroes (BdrvChild *child,int64_t offset,int64_t bytes,BdrvRequestFlags flags);int bdrv_make_zero (BdrvChild *child,BdrvRequestFlags flags); -int bdrv_pread (BdrvChild *child,int64_t offset,void *buf,int64_t bytes); +int bdrv_pread (BdrvChild *child,int64_t offset,void *buf,int64_t bytes, +BdrvRequestFlags flags);int bdrv_pwrite (BdrvChild *child,int64_t offset,const void *buf, -int64_t bytes); +int64_t bytes,BdrvRequestFlags flags);int bdrv_pwrite_sync (BdrvChild *child,int64_t offset, -const void *buf,int64_t bytes); +const void *buf,int64_t bytes,BdrvRequestFlags flags);/* * Efficiently zero a region of the disk image. Note that this is a regular * I/O request like read or write and should have a reasonable size. This
tests/unit/test-block-iothread.c +4 -4
@@ -88,11 +88,11 @@ static void test_sync_op_pread(BdrvChild *c)int ret;/* Success */ - ret =bdrv_pread (c,0 , buf,sizeof (buf)); + ret =bdrv_pread (c,0 , buf,sizeof (buf),0 ); g_assert_cmpint(ret, ==, 512);/* Early error: Negative offset */ - ret =bdrv_pread (c,-2 , buf,sizeof (buf)); + ret =bdrv_pread (c,-2 , buf,sizeof (buf),0 ); g_assert_cmpint(ret, ==, -EIO); }
@@ -102,11 +102,11 @@ static void test_sync_op_pwrite(BdrvChild *c)int ret;/* Success */ - ret =bdrv_pwrite (c,0 , buf,sizeof (buf)); + ret =bdrv_pwrite (c,0 , buf,sizeof (buf),0 ); g_assert_cmpint(ret, ==, 512);/* Early error: Negative offset */ - ret =bdrv_pwrite (c,-2 , buf,sizeof (buf)); + ret =bdrv_pwrite (c,-2 , buf,sizeof (buf),0 ); g_assert_cmpint(ret, ==, -EIO); }
Signature · 1 line
2.35.3
Re: [PATCH v5 01/10] block: Add a 'flags' param to bdrv_{pread,pwrite,pwrite_sync}()
Quoted 41 lines · Alberto Faria
For consistency with other I/O functions, and in preparation to implement them using
generated_co_wrapper.Callers were updated using this Coccinelle script:
@@ expression child, offset, buf, bytes; @@
-bdrv_pread(child, offset, buf, bytes)
+bdrv_pread(child, offset, buf, bytes, 0)@@ expression child, offset, buf, bytes; @@
-bdrv_pwrite(child, offset, buf, bytes)
+bdrv_pwrite(child, offset, buf, bytes, 0)@@ expression child, offset, buf, bytes; @@
-bdrv_pwrite_sync(child, offset, buf, bytes)
+bdrv_pwrite_sync(child, offset, buf, bytes, 0)Resulting overly-long lines were then fixed by hand.
Signed-off-by Alberto Faria <[email protected]>Reviewed-by Paolo Bonzini <[email protected]>Reviewed-by Stefan Hajnoczi <[email protected]>Reviewed-by Vladimir Sementsov-Ogievskiy <[email protected]>--- block/blklogwrites.c | 4 +-- block/bochs.c | 6 ++-- block/cloop.c | 10 +++--- block/crypto.c | 4 +-- block/dmg.c | 24 +++++++------- block/io.c | 13 ++++---- block/parallels-ext.c | 4 +-- block/parallels.c | 12 +++---- block/qcow.c | 27 ++++++++------- block/qcow2-bitmap.c | 14 ++++---- block/qcow2-cache.c | 7 ++-- block/qcow2-cluster.c | 21 ++++++------ block/qcow2-refcount.c | 42 +++++++++++------------ block/qcow2-snapshot.c | 39 +++++++++++----------- block/qcow2.c | 44 ++++++++++++------------ block/qed.c | 8 ++--- block/vdi.c | 10 +++---
Quoted 8 lines
block/vhdx-log.c | 19 +++++------ block/vhdx.c | 32 ++++++++++-------- block/vmdk.c | 57 ++++++++++++++------------------ block/vpc.c | 19 ++++++----- block/vvfat.c | 7 ++-- include/block/block-io.h | 7 ++-- tests/unit/test-block-iothread.c | 8 ++--- 24 files changed, 219 insertions(+), 219 deletions(-)
PATCH v5 2/10 block: Change bdrv_{pread, pwrite, pwrite_sync}() param order
In reply to Alberto FariaSwap 'buf' and 'bytes' around for consistency with bdrv_co_{pread,pwrite}(), and in preparation to implement these functions using generated_co_wrapper.
Callers were updated using this Coccinelle script:
@@ expression child, offset, buf, bytes, flags; @@
- bdrv_pread(child, offset, buf, bytes, flags)
+ bdrv_pread(child, offset, bytes, buf, flags)
@@ expression child, offset, buf, bytes, flags; @@
- bdrv_pwrite(child, offset, buf, bytes, flags)
+ bdrv_pwrite(child, offset, bytes, buf, flags)
@@ expression child, offset, buf, bytes, flags; @@
- bdrv_pwrite_sync(child, offset, buf, bytes, flags)
+ bdrv_pwrite_sync(child, offset, bytes, buf, flags)
Resulting overly-long lines were then fixed by hand.
--- block/blklogwrites.c | 6 ++-- block/bochs.c | 10 +++--- block/cloop.c | 10 +++--- block/crypto.c | 4 +-- block/dmg.c | 26 +++++++-------- block/io.c | 12 +++---- block/parallels-ext.c | 6 ++-- block/parallels.c | 10 +++--- block/qcow.c | 34 +++++++++---------- block/qcow2-bitmap.c | 14 ++++---- block/qcow2-cache.c | 8 ++--- block/qcow2-cluster.c | 22 ++++++------- block/qcow2-refcount.c | 56 +++++++++++++++++--------------- block/qcow2-snapshot.c | 48 +++++++++++++-------------- block/qcow2.c | 47 ++++++++++++++------------- block/qed.c | 8 ++--- block/vdi.c | 14 ++++---- block/vhdx-log.c | 18 +++++----- block/vhdx.c | 28 ++++++++-------- block/vmdk.c | 50 ++++++++++++++-------------- block/vpc.c | 22 ++++++------- block/vvfat.c | 10 +++--- include/block/block-io.h | 10 +++--- tests/unit/test-block-iothread.c | 8 ++--- 24 files changed, 242 insertions(+), 239 deletions(-)
block/blklogwrites.c +3 -3
@@ -107,8 +107,8 @@ static uint64_t blk_log_writes_find_cur_log_sector(BdrvChild *log,struct log_write_entry cur_entry;while (cur_idx < nr_entries) { -int read_ret =bdrv_pread (log, cur_sector << sector_bits, &cur_entry, -sizeof (cur_entry),0 ); +int read_ret =bdrv_pread (log, cur_sector << sector_bits, +sizeof (cur_entry), &cur_entry,0 );if (read_ret <0 ) {error_setg_errno (errp, -read_ret,"Failed to read log entry %" PRIu64, cur_idx);
@@ -190,7 +190,7 @@ static int blk_log_writes_open(BlockDriverState *bs, QDict *options, int flags, log_sb.nr_entries =cpu_to_le64 (0 ); log_sb.sectorsize =cpu_to_le32 (BDRV_SECTOR_SIZE ); }else { - ret =bdrv_pread (s->log_file,0 , &log_sb,sizeof (log_sb),0 ); + ret =bdrv_pread (s->log_file,0 ,sizeof (log_sb), &log_sb,0 );if (ret <0 ) {error_setg_errno (errp, -ret,"Could not read log superblock" ); goto fail_log;
block/bochs.c +5 -5
@@ -116,7 +116,7 @@ static int bochs_open(BlockDriverState *bs, QDict *options, int flags,return -EINVAL ; } - ret =bdrv_pread (bs->file,0 , &bochs,sizeof (bochs),0 ); + ret =bdrv_pread (bs->file,0 ,sizeof (bochs), &bochs,0 );if (ret <0 ) {return ret; }
@@ -150,8 +150,8 @@ static int bochs_open(BlockDriverState *bs, QDict *options, int flags,return -ENOMEM ; } - ret =bdrv_pread (bs->file,le32_to_cpu (bochs.header), s->catalog_bitmap, - s->catalog_size *4 ,0 ); + ret =bdrv_pread (bs->file,le32_to_cpu (bochs.header), s->catalog_size *4 , + s->catalog_bitmap,0 );if (ret <0 ) { goto fail; }
@@ -224,8 +224,8 @@ static int64_t seek_to_sector(BlockDriverState *bs, int64_t sector_num) (s->extent_blocks + s->bitmap_blocks));/* read in bitmap for current extent */ - ret =bdrv_pread (bs->file, bitmap_offset + (extent_offset /8 ), - &bitmap_entry,1 ,0 ); + ret =bdrv_pread (bs->file, bitmap_offset + (extent_offset /8 ),1 , + &bitmap_entry,0 );if (ret <0 ) {return ret; }
block/cloop.c +5 -5
@@ -78,7 +78,7 @@ static int cloop_open(BlockDriverState *bs, QDict *options, int flags, }/* read header */ - ret =bdrv_pread (bs->file,128 , &s->block_size,4 ,0 ); + ret =bdrv_pread (bs->file,128 ,4 , &s->block_size,0 );if (ret <0 ) {return ret; }
@@ -104,7 +104,7 @@ static int cloop_open(BlockDriverState *bs, QDict *options, int flags,return -EINVAL ; } - ret =bdrv_pread (bs->file,128 +4 , &s->n_blocks,4 ,0 ); + ret =bdrv_pread (bs->file,128 +4 ,4 , &s->n_blocks,0 );if (ret <0 ) {return ret; }
@@ -135,7 +135,7 @@ static int cloop_open(BlockDriverState *bs, QDict *options, int flags,return -ENOMEM ; } - ret =bdrv_pread (bs->file,128 +4 +4 , s->offsets, offsets_size,0 ); + ret =bdrv_pread (bs->file,128 +4 +4 , offsets_size, s->offsets,0 );if (ret <0 ) { goto fail; }
@@ -220,8 +220,8 @@ static inline int cloop_read_block(BlockDriverState *bs, int block_num)int ret;uint32_t bytes = s->offsets[block_num +1 ] - s->offsets[block_num]; - ret =bdrv_pread (bs->file, s->offsets[block_num], s->compressed_block, - bytes,0 ); + ret =bdrv_pread (bs->file, s->offsets[block_num], bytes, + s->compressed_block,0 );if (ret != bytes) {return -1 ; }
block/crypto.c +2 -2
@@ -65,7 +65,7 @@ static ssize_t block_crypto_read_func(QCryptoBlock *block,BlockDriverState *bs = opaque;ssize_t ret; - ret =bdrv_pread (bs->file, offset, buf, buflen,0 ); + ret =bdrv_pread (bs->file, offset, buflen, buf,0 );if (ret <0 ) {error_setg_errno (errp, -ret,"Could not read encryption header" );return ret;
@@ -83,7 +83,7 @@ static ssize_t block_crypto_write_func(QCryptoBlock *block,BlockDriverState *bs = opaque;ssize_t ret; - ret =bdrv_pwrite (bs->file, offset, buf, buflen,0 ); + ret =bdrv_pwrite (bs->file, offset, buflen, buf,0 );if (ret <0 ) {error_setg_errno (errp, -ret,"Could not write encryption header" );return ret;
block/dmg.c +13 -13
@@ -77,7 +77,7 @@ static int read_uint64(BlockDriverState *bs, int64_t offset, uint64_t *result)uint64_t buffer;int ret; - ret =bdrv_pread (bs->file, offset, &buffer,8 ,0 ); + ret =bdrv_pread (bs->file, offset,8 , &buffer,0 );if (ret <0 ) {return ret; }
@@ -91,7 +91,7 @@ static int read_uint32(BlockDriverState *bs, int64_t offset, uint32_t *result)uint32_t buffer;int ret; - ret =bdrv_pread (bs->file, offset, &buffer,4 ,0 ); + ret =bdrv_pread (bs->file, offset,4 , &buffer,0 );if (ret <0 ) {return ret; }
@@ -172,7 +172,7 @@ static int64_t dmg_find_koly_offset(BdrvChild *file, Error **errp) offset = length -511 -512 ; } length = length <515 ? length :515 ; - ret =bdrv_pread (file, offset, buffer, length,0 ); + ret =bdrv_pread (file, offset, length, buffer,0 );if (ret <0 ) {error_setg_errno (errp, -ret,"Failed while reading UDIF trailer" );return ret;
@@ -352,7 +352,7 @@ static int dmg_read_resource_fork(BlockDriverState *bs, DmgHeaderState *ds, offset +=4 ; buffer =g_realloc (buffer, count); - ret =bdrv_pread (bs->file, offset, buffer, count,0 ); + ret =bdrv_pread (bs->file, offset, count, buffer,0 );if (ret <0 ) { goto fail; }
@@ -389,7 +389,7 @@ static int dmg_read_plist_xml(BlockDriverState *bs, DmgHeaderState *ds, buffer =g_malloc (info_length +1 ); buffer[info_length] ='\0' ; - ret =bdrv_pread (bs->file, info_begin, buffer, info_length,0 ); + ret =bdrv_pread (bs->file, info_begin, info_length, buffer,0 );if (ret != info_length) { ret = -EINVAL ; goto fail;
@@ -609,8 +609,8 @@ static inline int dmg_read_chunk(BlockDriverState *bs, uint64_t sector_num)case UDZO : {/* zlib compressed */ /* we need to buffer, because only the chunk as whole can be * inflated. */ - ret =bdrv_pread (bs->file, s->offsets[chunk], s->compressed_chunk, - s->lengths[chunk],0 ); + ret =bdrv_pread (bs->file, s->offsets[chunk], s->lengths[chunk], + s->compressed_chunk,0 );if (ret != s->lengths[chunk]) {return -1 ; }
@@ -635,8 +635,8 @@ static inline int dmg_read_chunk(BlockDriverState *bs, uint64_t sector_num) }/* we need to buffer, because only the chunk as whole can be * inflated. */ - ret =bdrv_pread (bs->file, s->offsets[chunk], s->compressed_chunk, - s->lengths[chunk],0 ); + ret =bdrv_pread (bs->file, s->offsets[chunk], s->lengths[chunk], + s->compressed_chunk,0 );if (ret != s->lengths[chunk]) {return -1 ; }
@@ -656,8 +656,8 @@ static inline int dmg_read_chunk(BlockDriverState *bs, uint64_t sector_num) }/* we need to buffer, because only the chunk as whole can be * inflated. */ - ret =bdrv_pread (bs->file, s->offsets[chunk], s->compressed_chunk, - s->lengths[chunk],0 ); + ret =bdrv_pread (bs->file, s->offsets[chunk], s->lengths[chunk], + s->compressed_chunk,0 );if (ret != s->lengths[chunk]) {return -1 ; }
@@ -672,8 +672,8 @@ static inline int dmg_read_chunk(BlockDriverState *bs, uint64_t sector_num) }break ;case UDRW :/* copy */ - ret =bdrv_pread (bs->file, s->offsets[chunk], - s->uncompressed_chunk, s->lengths[chunk],0 ); + ret =bdrv_pread (bs->file, s->offsets[chunk], s->lengths[chunk], + s->uncompressed_chunk,0 );if (ret != s->lengths[chunk]) {return -1 ; }
block/io.c +6 -6
@@ -1112,7 +1112,7 @@ int bdrv_make_zero(BdrvChild *child, BdrvRequestFlags flags) }/* See bdrv_pwrite() for the return codes */ -int bdrv_pread (BdrvChild *child,int64_t offset,void *buf,int64_t bytes, +int bdrv_pread (BdrvChild *child,int64_t offset,int64_t bytes,void *buf,BdrvRequestFlags flags) {int ret;
@@ -1134,8 +1134,8 @@ int bdrv_pread(BdrvChild *child, int64_t offset, void *buf, int64_t bytes,-EINVAL Invalid offset or number of bytes -EACCES Trying to write a read-only device */ -int bdrv_pwrite (BdrvChild *child,int64_t offset,const void *buf, -int64_t bytes,BdrvRequestFlags flags) +int bdrv_pwrite (BdrvChild *child,int64_t offset,int64_t bytes, +const void *buf,BdrvRequestFlags flags) {int ret;QEMUIOVector qiov =QEMU_IOVEC_INIT_BUF (qiov, buf, bytes);
@@ -1156,13 +1156,13 @@ int bdrv_pwrite(BdrvChild *child, int64_t offset, const void *buf,* * Returns 0 on success, -errno in error cases. */ -int bdrv_pwrite_sync (BdrvChild *child,int64_t offset, -const void *buf,int64_t count,BdrvRequestFlags flags) +int bdrv_pwrite_sync (BdrvChild *child,int64_t offset,int64_t bytes, +const void *buf,BdrvRequestFlags flags) {int ret;IO_CODE (); - ret =bdrv_pwrite (child, offset, buf, count, flags); + ret =bdrv_pwrite (child, offset, bytes, buf, flags);if (ret <0 ) {return ret; }
block/parallels-ext.c +3 -3
@@ -93,8 +93,8 @@ static int parallels_load_bitmap_data(BlockDriverState *bs,if (entry ==1 ) {bdrv_dirty_bitmap_deserialize_ones (bitmap, offset, count, false); }else { - ret =bdrv_pread (bs->file, entry <<BDRV_SECTOR_BITS , buf, - s->cluster_size,0 ); + ret =bdrv_pread (bs->file, entry <<BDRV_SECTOR_BITS , + s->cluster_size, buf,0 );if (ret <0 ) {error_setg_errno (errp, -ret,"Failed to read bitmap data cluster" );
@@ -286,7 +286,7 @@ int parallels_read_format_extension(BlockDriverState *bs,assert (ext_off >0 ); - ret =bdrv_pread (bs->file, ext_off, ext_cluster, s->cluster_size,0 ); + ret =bdrv_pread (bs->file, ext_off, s->cluster_size, ext_cluster,0 );if (ret <0 ) {error_setg_errno (errp, -ret,"Failed to read Format Extension cluster" ); goto out;
block/parallels.c +5 -5
@@ -277,7 +277,7 @@ static coroutine_fn int parallels_co_flush_to_os(BlockDriverState *bs)if (off + to_write > s->header_size) { to_write = s->header_size - off; } - ret =bdrv_pwrite (bs->file, off, (uint8_t *)s->header + off, to_write, + ret =bdrv_pwrite (bs->file, off, to_write, (uint8_t *)s->header + off,0 );if (ret <0 ) {qemu_co_mutex_unlock (&s->lock);
@@ -481,7 +481,7 @@ static int coroutine_fn parallels_co_check(BlockDriverState *bs, ret =0 ;if (flush_bat) { - ret =bdrv_pwrite_sync (bs->file,0 , s->header, s->header_size,0 ); + ret =bdrv_pwrite_sync (bs->file,0 , s->header_size, s->header,0 );if (ret <0 ) { res->check_errors++; goto out;
@@ -723,7 +723,7 @@ static int parallels_update_header(BlockDriverState *bs)if (size > s->header_size) { size = s->header_size; } -return bdrv_pwrite_sync (bs->file,0 , s->header, size,0 ); +return bdrv_pwrite_sync (bs->file,0 , size, s->header,0 ); } static int parallels_open(BlockDriverState *bs, QDict *options, int flags,
@@ -742,7 +742,7 @@ static int parallels_open(BlockDriverState *bs, QDict *options, int flags,return -EINVAL ; } - ret =bdrv_pread (bs->file,0 , &ph,sizeof (ph),0 ); + ret =bdrv_pread (bs->file,0 ,sizeof (ph), &ph,0 );if (ret <0 ) { goto fail; }
@@ -798,7 +798,7 @@ static int parallels_open(BlockDriverState *bs, QDict *options, int flags, s->header_size = size; } - ret =bdrv_pread (bs->file,0 , s->header, s->header_size,0 ); + ret =bdrv_pread (bs->file,0 , s->header_size, s->header,0 );if (ret <0 ) { goto fail; }
block/qcow.c +17 -17
@@ -128,7 +128,7 @@ static int qcow_open(BlockDriverState *bs, QDict *options, int flags, goto fail; } - ret =bdrv_pread (bs->file,0 , &header,sizeof (header),0 ); + ret =bdrv_pread (bs->file,0 ,sizeof (header), &header,0 );if (ret <0 ) { goto fail; }
@@ -260,8 +260,8 @@ static int qcow_open(BlockDriverState *bs, QDict *options, int flags, goto fail; } - ret =bdrv_pread (bs->file, s->l1_table_offset, s->l1_table, - s->l1_size *sizeof (uint64_t ),0 ); + ret =bdrv_pread (bs->file, s->l1_table_offset, + s->l1_size *sizeof (uint64_t ), s->l1_table,0 );if (ret <0 ) { goto fail; }
@@ -291,8 +291,8 @@ static int qcow_open(BlockDriverState *bs, QDict *options, int flags, ret = -EINVAL ; goto fail; } - ret =bdrv_pread (bs->file, header.backing_file_offset, - bs->auto_backing_file, len,0 ); + ret =bdrv_pread (bs->file, header.backing_file_offset, len, + bs->auto_backing_file,0 );if (ret <0 ) { goto fail; }
@@ -383,7 +383,7 @@ static int get_cluster_offset(BlockDriverState *bs,BLKDBG_EVENT (bs->file,BLKDBG_L1_UPDATE ); ret =bdrv_pwrite_sync (bs->file, s->l1_table_offset + l1_index *sizeof (tmp), - &tmp,sizeof (tmp),0 ); +sizeof (tmp), &tmp,0 );if (ret <0 ) {return ret; }
@@ -414,14 +414,14 @@ static int get_cluster_offset(BlockDriverState *bs,BLKDBG_EVENT (bs->file,BLKDBG_L2_LOAD );if (new_l2_table) {memset (l2_table,0 , s->l2_size *sizeof (uint64_t )); - ret =bdrv_pwrite_sync (bs->file, l2_offset, l2_table, - s->l2_size *sizeof (uint64_t ),0 ); + ret =bdrv_pwrite_sync (bs->file, l2_offset, + s->l2_size *sizeof (uint64_t ), l2_table,0 );if (ret <0 ) {return ret; } }else { - ret =bdrv_pread (bs->file, l2_offset, l2_table, - s->l2_size *sizeof (uint64_t ),0 ); + ret =bdrv_pread (bs->file, l2_offset, s->l2_size *sizeof (uint64_t ), + l2_table,0 );if (ret <0 ) {return ret; }
@@ -453,8 +453,8 @@ static int get_cluster_offset(BlockDriverState *bs, cluster_offset =QEMU_ALIGN_UP (cluster_offset, s->cluster_size);/* write the cluster content */ BLKDBG_EVENT (bs->file,BLKDBG_WRITE_AIO ); - ret =bdrv_pwrite (bs->file, cluster_offset, s->cluster_cache, - s->cluster_size,0 ); + ret =bdrv_pwrite (bs->file, cluster_offset, s->cluster_size, + s->cluster_cache,0 );if (ret <0 ) {return ret; }
@@ -493,8 +493,8 @@ static int get_cluster_offset(BlockDriverState *bs, }BLKDBG_EVENT (bs->file,BLKDBG_WRITE_AIO ); ret =bdrv_pwrite (bs->file, cluster_offset + i, - s->cluster_data, -BDRV_SECTOR_SIZE ,0 ); +BDRV_SECTOR_SIZE , + s->cluster_data,0 );if (ret <0 ) {return ret; }
@@ -515,7 +515,7 @@ static int get_cluster_offset(BlockDriverState *bs,BLKDBG_EVENT (bs->file,BLKDBG_L2_UPDATE ); } ret =bdrv_pwrite_sync (bs->file, l2_offset + l2_index *sizeof (tmp), - &tmp,sizeof (tmp),0 ); +sizeof (tmp), &tmp,0 );if (ret <0 ) {return ret; }
@@ -596,7 +596,7 @@ static int decompress_cluster(BlockDriverState *bs, uint64_t cluster_offset) csize = cluster_offset >> (63 - s->cluster_bits); csize &= (s->cluster_size -1 );BLKDBG_EVENT (bs->file,BLKDBG_READ_COMPRESSED ); - ret =bdrv_pread (bs->file, coffset, s->cluster_data, csize,0 ); + ret =bdrv_pread (bs->file, coffset, csize, s->cluster_data,0 );if (ret != csize)return -1 ; if (decompress_buffer(s->cluster_cache, s->cluster_size,
@@ -1029,7 +1029,7 @@ static int qcow_make_empty(BlockDriverState *bs)int ret;memset (s->l1_table,0 , l1_length); -if (bdrv_pwrite_sync (bs->file, s->l1_table_offset, s->l1_table, l1_length, +if (bdrv_pwrite_sync (bs->file, s->l1_table_offset, l1_length, s->l1_table,0 ) <0 )return -1 ; ret = bdrv_truncate(bs->file, s->l1_table_offset + l1_length, false,
block/qcow2-bitmap.c +7 -7
@@ -234,8 +234,8 @@ static int bitmap_table_load(BlockDriverState *bs, Qcow2BitmapTable *tb, }assert (tb->size <=BME_MAX_TABLE_SIZE ); - ret =bdrv_pread (bs->file, tb->offset, table, - tb->size *BME_TABLE_ENTRY_SIZE ,0 ); + ret =bdrv_pread (bs->file, tb->offset, tb->size *BME_TABLE_ENTRY_SIZE , + table,0 );if (ret <0 ) { goto fail; }
@@ -317,7 +317,7 @@ static int load_bitmap_data(BlockDriverState *bs,* already cleared */ } }else { - ret =bdrv_pread (bs->file, data_offset, buf, s->cluster_size,0 ); + ret =bdrv_pread (bs->file, data_offset, s->cluster_size, buf,0 );if (ret <0 ) { goto finish; }
@@ -575,7 +575,7 @@ static Qcow2BitmapList *bitmap_list_load(BlockDriverState *bs, uint64_t offset, } dir_end = dir + size; - ret =bdrv_pread (bs->file, offset, dir, size,0 ); + ret =bdrv_pread (bs->file, offset, size, dir,0 );if (ret <0 ) {error_setg_errno (errp, -ret,"Failed to read bitmap directory" ); goto fail;
@@ -798,7 +798,7 @@ static int bitmap_list_store(BlockDriverState *bs, Qcow2BitmapList *bm_list, goto fail; } - ret =bdrv_pwrite (bs->file, dir_offset, dir, dir_size,0 ); + ret =bdrv_pwrite (bs->file, dir_offset, dir_size, dir,0 );if (ret <0 ) { goto fail; }
@@ -1339,7 +1339,7 @@ static uint64_t *store_bitmap_data(BlockDriverState *bs, goto fail; } - ret =bdrv_pwrite (bs->file, off, buf, s->cluster_size,0 ); + ret =bdrv_pwrite (bs->file, off, s->cluster_size, buf,0 );if (ret <0 ) {error_setg_errno (errp, -ret,"Failed to write bitmap '%s' to file" , bm_name);
@@ -1402,7 +1402,7 @@ static int store_bitmap(BlockDriverState *bs, Qcow2Bitmap *bm, Error **errp) }bitmap_table_to_be (tb, tb_size); - ret =bdrv_pwrite (bs->file, tb_offset, tb, tb_size *sizeof (tb[0 ]),0 ); + ret =bdrv_pwrite (bs->file, tb_offset, tb_size *sizeof (tb[0 ]), tb,0 );if (ret <0 ) {error_setg_errno (errp, -ret,"Failed to write bitmap '%s' to file" , bm_name);
block/qcow2-cache.c +4 -4
@@ -223,8 +223,8 @@ static int qcow2_cache_entry_flush(BlockDriverState *bs, Qcow2Cache *c, int i)BLKDBG_EVENT (bs->file,BLKDBG_L2_UPDATE ); } - ret =bdrv_pwrite (bs->file, c->entries[i].offset, -qcow2_cache_get_table_addr (c, i), c->table_size,0 ); + ret =bdrv_pwrite (bs->file, c->entries[i].offset, c->table_size, +qcow2_cache_get_table_addr (c, i),0 );if (ret <0 ) {return ret; }
@@ -379,8 +379,8 @@ static int qcow2_cache_do_get(BlockDriverState *bs, Qcow2Cache *c,BLKDBG_EVENT (bs->file,BLKDBG_L2_LOAD ); } - ret =bdrv_pread (bs->file, offset,qcow2_cache_get_table_addr (c, i), - c->table_size,0 ); + ret =bdrv_pread (bs->file, offset, c->table_size, +qcow2_cache_get_table_addr (c, i),0 );if (ret <0 ) {return ret; }
block/qcow2-cluster.c +11 -11
@@ -159,8 +159,8 @@ int qcow2_grow_l1_table(BlockDriverState *bs, uint64_t min_size,BLKDBG_EVENT (bs->file,BLKDBG_L1_GROW_WRITE_TABLE );for (i =0 ; i < s->l1_size; i++) new_l1_table[i] =cpu_to_be64 (new_l1_table[i]); - ret =bdrv_pwrite_sync (bs->file, new_l1_table_offset, new_l1_table, - new_l1_size2,0 ); + ret =bdrv_pwrite_sync (bs->file, new_l1_table_offset, new_l1_size2, + new_l1_table,0 );if (ret <0 ) goto fail;for (i =0 ; i < s->l1_size; i++)
@@ -170,8 +170,8 @@ int qcow2_grow_l1_table(BlockDriverState *bs, uint64_t min_size,BLKDBG_EVENT (bs->file,BLKDBG_L1_GROW_ACTIVATE_TABLE );stl_be_p (data, new_l1_size);stq_be_p (data +4 , new_l1_table_offset); - ret =bdrv_pwrite_sync (bs->file, offsetof(QCowHeader , l1_size), data, -sizeof (data),0 ); + ret =bdrv_pwrite_sync (bs->file, offsetof(QCowHeader , l1_size), +sizeof (data), data,0 );if (ret <0 ) { goto fail; }
@@ -249,7 +249,7 @@ int qcow2_write_l1_entry(BlockDriverState *bs, int l1_index)BLKDBG_EVENT (bs->file,BLKDBG_L1_UPDATE ); ret =bdrv_pwrite_sync (bs->file, s->l1_table_offset +L1E_SIZE * l1_start_index, - buf, bufsize,0 ); + bufsize, buf,0 );if (ret <0 ) {return ret; }
@@ -2260,8 +2260,8 @@ static int expand_zero_clusters_in_l1(BlockDriverState *bs, uint64_t *l1_table, (void **)&l2_slice); }else {/* load inactive L2 tables from disk */ - ret =bdrv_pread (bs->file, slice_offset, l2_slice, - slice_size2,0 ); + ret =bdrv_pread (bs->file, slice_offset, slice_size2, + l2_slice,0 ); }if (ret <0 ) { goto fail;
@@ -2377,8 +2377,8 @@ static int expand_zero_clusters_in_l1(BlockDriverState *bs, uint64_t *l1_table, goto fail; } - ret =bdrv_pwrite (bs->file, slice_offset, l2_slice, - slice_size2,0 ); + ret =bdrv_pwrite (bs->file, slice_offset, slice_size2, + l2_slice,0 );if (ret <0 ) { goto fail; }
@@ -2471,8 +2471,8 @@ int qcow2_expand_zero_clusters(BlockDriverState *bs, l1_table = new_l1_table; - ret =bdrv_pread (bs->file, s->snapshots[i].l1_table_offset, l1_table, - l1_size2,0 ); + ret =bdrv_pread (bs->file, s->snapshots[i].l1_table_offset, l1_size2, + l1_table,0 );if (ret <0 ) { goto fail; }
block/qcow2-refcount.c +29 -27
164 lines not on this page · raw message
block/qcow2-snapshot.c +24 -24
148 lines not on this page · raw message
block/qcow2.c +24 -23
155 lines not on this page · raw message
block/qed.c +4 -4
@@ -90,7 +90,7 @@ int qed_write_header_sync(BDRVQEDState *s)int ret;qed_header_cpu_to_le (&s->header, &le); - ret =bdrv_pwrite (s->bs->file,0 , &le,sizeof (le),0 ); + ret =bdrv_pwrite (s->bs->file,0 ,sizeof (le), &le,0 );if (ret !=sizeof (le)) {return ret; }
@@ -207,7 +207,7 @@ static int qed_read_string(BdrvChild *file, uint64_t offset, size_t n,if (n >= buflen) {return -EINVAL ; } - ret =bdrv_pread (file, offset, buf, n,0 ); + ret =bdrv_pread (file, offset, n, buf,0 );if (ret <0 ) {return ret; }
@@ -392,7 +392,7 @@ static int coroutine_fn bdrv_qed_do_open(BlockDriverState *bs, QDict *options,int64_t file_size;int ret; - ret =bdrv_pread (bs->file,0 , &le_header,sizeof (le_header),0 ); + ret =bdrv_pread (bs->file,0 ,sizeof (le_header), &le_header,0 );if (ret <0 ) {error_setg (errp,"Failed to read QED header" );return ret;
@@ -1545,7 +1545,7 @@ static int bdrv_qed_change_backing_file(BlockDriverState *bs, }/* Write new header */ - ret =bdrv_pwrite_sync (bs->file,0 , buffer, buffer_len,0 ); + ret =bdrv_pwrite_sync (bs->file,0 , buffer_len, buffer,0 );g_free (buffer);if (ret ==0 ) {memcpy (&s->header, &new_header,sizeof (new_header));
block/vdi.c +7 -7
@@ -385,7 +385,7 @@ static int vdi_open(BlockDriverState *bs, QDict *options, int flags,logout ("\n" ); - ret =bdrv_pread (bs->file,0 , &header,sizeof (header),0 ); + ret =bdrv_pread (bs->file,0 ,sizeof (header), &header,0 );if (ret <0 ) { goto fail; }
@@ -485,8 +485,8 @@ static int vdi_open(BlockDriverState *bs, QDict *options, int flags, goto fail; } - ret =bdrv_pread (bs->file, header.offset_bmap, s->bmap, - bmap_size *SECTOR_SIZE ,0 ); + ret =bdrv_pread (bs->file, header.offset_bmap, bmap_size *SECTOR_SIZE , + s->bmap,0 );if (ret <0 ) { goto fail_free_bmap; }
@@ -664,7 +664,7 @@ vdi_co_pwritev(BlockDriverState *bs, int64_t offset, int64_t bytes,* so this full-cluster write does not overlap a partial write * of the same cluster, issued from the "else" branch. */ - ret =bdrv_pwrite (bs->file, data_offset, block, s->block_size,0 ); + ret =bdrv_pwrite (bs->file, data_offset, s->block_size, block,0 );qemu_co_rwlock_unlock (&s->bmap_lock); }else { nonallocating_write:
@@ -709,7 +709,7 @@ nonallocating_write:assert (VDI_IS_ALLOCATED (bmap_first)); *header = s->header;vdi_header_to_le (header); - ret =bdrv_pwrite (bs->file,0 , header,sizeof (*header),0 ); + ret =bdrv_pwrite (bs->file,0 ,sizeof (*header), header,0 );g_free (header);if (ret <0 ) {
@@ -726,8 +726,8 @@ nonallocating_write: base = ((uint8_t *)&s->bmap[0 ]) + bmap_first *SECTOR_SIZE ;logout ("will write %u block map sectors starting from entry %u\n" , n_sectors, bmap_first); - ret =bdrv_pwrite (bs->file, offset *SECTOR_SIZE , base, - n_sectors *SECTOR_SIZE ,0 ); + ret =bdrv_pwrite (bs->file, offset *SECTOR_SIZE , + n_sectors *SECTOR_SIZE , base,0 ); }return ret <0 ? ret :0 ;
block/vhdx-log.c +9 -9
@@ -84,7 +84,7 @@ static int vhdx_log_peek_hdr(BlockDriverState *bs, VHDXLogEntries *log, offset = log->offset + read; - ret =bdrv_pread (bs->file, offset, hdr,sizeof (VHDXLogEntryHeader),0 ); + ret =bdrv_pread (bs->file, offset,sizeof (VHDXLogEntryHeader), hdr,0 );if (ret <0 ) { goto exit; }
@@ -144,7 +144,7 @@ static int vhdx_log_read_sectors(BlockDriverState *bs, VHDXLogEntries *log, } offset = log->offset + read; - ret =bdrv_pread (bs->file, offset, buffer,VHDX_LOG_SECTOR_SIZE ,0 ); + ret =bdrv_pread (bs->file, offset,VHDX_LOG_SECTOR_SIZE , buffer,0 );if (ret <0 ) { goto exit; }
@@ -194,7 +194,7 @@ static int vhdx_log_write_sectors(BlockDriverState *bs, VHDXLogEntries *log,/* full */ break ; } - ret =bdrv_pwrite (bs->file, offset, buffer_tmp,VHDX_LOG_SECTOR_SIZE , + ret =bdrv_pwrite (bs->file, offset,VHDX_LOG_SECTOR_SIZE , buffer_tmp,0 );if (ret <0 ) { goto exit;
@@ -466,8 +466,8 @@ static int vhdx_log_flush_desc(BlockDriverState *bs, VHDXLogDescriptor *desc,/* count is only > 1 if we are writing zeroes */ for (i =0 ; i < count; i++) { - ret =bdrv_pwrite_sync (bs->file, file_offset, buffer, -VHDX_LOG_SECTOR_SIZE ,0 ); + ret =bdrv_pwrite_sync (bs->file, file_offset,VHDX_LOG_SECTOR_SIZE , + buffer,0 );if (ret <0 ) { goto exit; }
@@ -970,8 +970,8 @@ static int vhdx_log_write(BlockDriverState *bs, BDRVVHDXState *s,if (i ==0 && leading_length) {/* partial sector at the front of the buffer */ - ret =bdrv_pread (bs->file, file_offset, merged_sector, -VHDX_LOG_SECTOR_SIZE ,0 ); + ret =bdrv_pread (bs->file, file_offset,VHDX_LOG_SECTOR_SIZE , + merged_sector,0 );if (ret <0 ) { goto exit; }
@@ -981,8 +981,8 @@ static int vhdx_log_write(BlockDriverState *bs, BDRVVHDXState *s, }else if (i == sectors -1 && trailing_length) {/* partial sector at the end of the buffer */ ret =bdrv_pread (bs->file, file_offset, - merged_sector + trailing_length, -VHDX_LOG_SECTOR_SIZE - trailing_length,0 ); +VHDX_LOG_SECTOR_SIZE - trailing_length, + merged_sector + trailing_length,0 );if (ret <0 ) { goto exit; }
block/vhdx.c +14 -14
@@ -326,7 +326,7 @@ static int vhdx_write_header(BdrvChild *file, VHDXHeader *hdr, buffer =qemu_blockalign (bs_file,VHDX_HEADER_SIZE );if (read) {/* if true, we can't assume the extra reserved bytes are 0 */ - ret =bdrv_pread (file, offset, buffer,VHDX_HEADER_SIZE ,0 ); + ret =bdrv_pread (file, offset,VHDX_HEADER_SIZE , buffer,0 );if (ret <0 ) { goto exit; }
@@ -340,7 +340,7 @@ static int vhdx_write_header(BdrvChild *file, VHDXHeader *hdr,vhdx_header_le_export (hdr, header_le);vhdx_update_checksum (buffer,VHDX_HEADER_SIZE , offsetof(VHDXHeader , checksum)); - ret =bdrv_pwrite_sync (file, offset, header_le,sizeof (VHDXHeader),0 ); + ret =bdrv_pwrite_sync (file, offset,sizeof (VHDXHeader), header_le,0 ); exit:qemu_vfree (buffer);
@@ -440,7 +440,7 @@ static void vhdx_parse_header(BlockDriverState *bs, BDRVVHDXState *s,/* We have to read the whole VHDX_HEADER_SIZE instead of * sizeof(VHDXHeader), because the checksum is over the whole * region */ - ret =bdrv_pread (bs->file,VHDX_HEADER1_OFFSET , buffer,VHDX_HEADER_SIZE , + ret =bdrv_pread (bs->file,VHDX_HEADER1_OFFSET ,VHDX_HEADER_SIZE , buffer,0 );if (ret <0 ) { goto fail;
@@ -457,7 +457,7 @@ static void vhdx_parse_header(BlockDriverState *bs, BDRVVHDXState *s, } } - ret =bdrv_pread (bs->file,VHDX_HEADER2_OFFSET , buffer,VHDX_HEADER_SIZE , + ret =bdrv_pread (bs->file,VHDX_HEADER2_OFFSET ,VHDX_HEADER_SIZE , buffer,0 );if (ret <0 ) { goto fail;
@@ -531,8 +531,8 @@ static int vhdx_open_region_tables(BlockDriverState *bs, BDRVVHDXState *s)* whole block */ buffer =qemu_blockalign (bs,VHDX_HEADER_BLOCK_SIZE ); - ret =bdrv_pread (bs->file,VHDX_REGION_TABLE_OFFSET , buffer, -VHDX_HEADER_BLOCK_SIZE ,0 ); + ret =bdrv_pread (bs->file,VHDX_REGION_TABLE_OFFSET , +VHDX_HEADER_BLOCK_SIZE , buffer,0 );if (ret <0 ) { goto fail; }
@@ -644,8 +644,8 @@ static int vhdx_parse_metadata(BlockDriverState *bs, BDRVVHDXState *s) buffer =qemu_blockalign (bs,VHDX_METADATA_TABLE_MAX_SIZE ); - ret =bdrv_pread (bs->file, s->metadata_rt.file_offset, buffer, -VHDX_METADATA_TABLE_MAX_SIZE ,0 ); + ret =bdrv_pread (bs->file, s->metadata_rt.file_offset, +VHDX_METADATA_TABLE_MAX_SIZE , buffer,0 );if (ret <0 ) { goto exit; }
@@ -750,8 +750,8 @@ static int vhdx_parse_metadata(BlockDriverState *bs, BDRVVHDXState *s) ret =bdrv_pread (bs->file, s->metadata_entries.file_parameters_entry.offset + s->metadata_rt.file_offset, - &s->params,sizeof (s->params), + &s->params,0 );if (ret <0 ) {
@@ -786,8 +786,8 @@ static int vhdx_parse_metadata(BlockDriverState *bs, BDRVVHDXState *s) ret =bdrv_pread (bs->file, s->metadata_entries.virtual_disk_size_entry.offset + s->metadata_rt.file_offset, - &s->virtual_disk_size,sizeof (uint64_t ), + &s->virtual_disk_size,0 );if (ret <0 ) { goto exit;
@@ -795,8 +795,8 @@ static int vhdx_parse_metadata(BlockDriverState *bs, BDRVVHDXState *s) ret =bdrv_pread (bs->file, s->metadata_entries.logical_sector_size_entry.offset + s->metadata_rt.file_offset, - &s->logical_sector_size,sizeof (uint32_t ), + &s->logical_sector_size,0 );if (ret <0 ) { goto exit;
@@ -804,8 +804,8 @@ static int vhdx_parse_metadata(BlockDriverState *bs, BDRVVHDXState *s) ret =bdrv_pread (bs->file, s->metadata_entries.phys_sector_size_entry.offset + s->metadata_rt.file_offset, - &s->physical_sector_size,sizeof (uint32_t ), + &s->physical_sector_size,0 );if (ret <0 ) { goto exit;
@@ -1014,7 +1014,7 @@ static int vhdx_open(BlockDriverState *bs, QDict *options, int flags,QLIST_INIT (&s->regions);/* validate the file signature */ - ret =bdrv_pread (bs->file,0 , &signature,sizeof (uint64_t ),0 ); + ret =bdrv_pread (bs->file,0 ,sizeof (uint64_t ), &signature,0 );if (ret <0 ) { goto fail; }
@@ -1073,7 +1073,7 @@ static int vhdx_open(BlockDriverState *bs, QDict *options, int flags, goto fail; } - ret =bdrv_pread (bs->file, s->bat_offset, s->bat, s->bat_rt.length,0 ); + ret =bdrv_pread (bs->file, s->bat_offset, s->bat_rt.length, s->bat,0 );if (ret <0 ) { goto fail; }
block/vmdk.c +25 -25
171 lines not on this page · raw message
block/vpc.c +11 -11
@@ -252,7 +252,7 @@ static int vpc_open(BlockDriverState *bs, QDict *options, int flags, goto fail; } - ret =bdrv_pread (bs->file,0 , &s->footer,sizeof (s->footer),0 ); + ret =bdrv_pread (bs->file,0 ,sizeof (s->footer), &s->footer,0 );if (ret <0 ) {error_setg (errp,"Unable to read VHD header" ); goto fail;
@@ -272,8 +272,8 @@ static int vpc_open(BlockDriverState *bs, QDict *options, int flags, }/* If a fixed disk, the footer is found only at the end of the file */ - ret =bdrv_pread (bs->file, offset -sizeof (*footer), footer, -sizeof (*footer),0 ); + ret =bdrv_pread (bs->file, offset -sizeof (*footer),sizeof (*footer), + footer,0 );if (ret <0 ) { goto fail; }
@@ -347,7 +347,7 @@ static int vpc_open(BlockDriverState *bs, QDict *options, int flags,if (disk_type ==VHD_DYNAMIC ) { ret =bdrv_pread (bs->file,be64_to_cpu (footer->data_offset), - &dyndisk_header,sizeof (dyndisk_header),0 ); +sizeof (dyndisk_header), &dyndisk_header,0 );if (ret <0 ) {error_setg (errp,"Error reading dynamic VHD header" ); goto fail;
@@ -401,8 +401,8 @@ static int vpc_open(BlockDriverState *bs, QDict *options, int flags, s->bat_offset =be64_to_cpu (dyndisk_header.table_offset); - ret =bdrv_pread (bs->file, s->bat_offset, s->pagetable, - pagetable_size,0 ); + ret =bdrv_pread (bs->file, s->bat_offset, pagetable_size, + s->pagetable,0 );if (ret <0 ) {error_setg (errp,"Error reading pagetable" ); goto fail;
@@ -516,7 +516,7 @@ static inline int64_t get_image_offset(BlockDriverState *bs, uint64_t offset, s->last_bitmap_offset = bitmap_offset;memset (bitmap,0xff , s->bitmap_size); - r =bdrv_pwrite_sync (bs->file, bitmap_offset, bitmap, s->bitmap_size, + r =bdrv_pwrite_sync (bs->file, bitmap_offset, s->bitmap_size, bitmap,0 );if (r <0 ) { *err = r;
@@ -539,7 +539,7 @@ static int rewrite_footer(BlockDriverState *bs)BDRVVPCState *s = bs->opaque;int64_t offset = s->free_data_block_offset; - ret =bdrv_pwrite_sync (bs->file, offset, &s->footer,sizeof (s->footer),0 ); + ret =bdrv_pwrite_sync (bs->file, offset,sizeof (s->footer), &s->footer,0 );if (ret <0 )return ret;
@@ -573,8 +573,8 @@ static int64_t alloc_block(BlockDriverState *bs, int64_t offset)/* Initialize the block's bitmap */ memset (bitmap,0xff , s->bitmap_size); - ret =bdrv_pwrite_sync (bs->file, s->free_data_block_offset, bitmap, - s->bitmap_size,0 ); + ret =bdrv_pwrite_sync (bs->file, s->free_data_block_offset, + s->bitmap_size, bitmap,0 );if (ret <0 ) {return ret; }
@@ -588,7 +588,7 @@ static int64_t alloc_block(BlockDriverState *bs, int64_t offset)/* Write BAT entry to disk */ bat_offset = s->bat_offset + (4 * index); bat_value =cpu_to_be32 (s->pagetable[index]); - ret =bdrv_pwrite_sync (bs->file, bat_offset, &bat_value,4 ,0 ); + ret =bdrv_pwrite_sync (bs->file, bat_offset,4 , &bat_value,0 );if (ret <0 ) goto fail;
block/vvfat.c +5 -5
@@ -1488,8 +1488,8 @@ static int vvfat_read(BlockDriverState *bs, int64_t sector_num,DLOG (fprintf (stderr,"sectors %" PRId64"+%" PRId64" allocated\n" , sector_num, n >>BDRV_SECTOR_BITS )); -if (bdrv_pread (s->qcow, sector_num *BDRV_SECTOR_SIZE , - buf + i *0x200 , n,0 ) <0 ) { +if (bdrv_pread (s->qcow, sector_num *BDRV_SECTOR_SIZE , n, + buf + i *0x200 ,0 ) <0 ) {return -1 ; } i += (n >>BDRV_SECTOR_BITS ) -1 ;
@@ -1978,7 +1978,7 @@ static uint32_t get_cluster_count_for_direntry(BDRVVVFATState* s,return -1 ; } res =bdrv_pwrite (s->qcow, offset *BDRV_SECTOR_SIZE , - s->cluster_buffer,BDRV_SECTOR_SIZE , +BDRV_SECTOR_SIZE , s->cluster_buffer,0 );if (res <0 ) {return -2 ;
@@ -3063,8 +3063,8 @@ DLOG(checkpoint());* Use qcow backend. Commit later. */ DLOG (fprintf (stderr,"Write to qcow backend: %d + %d\n" , (int )sector_num, nb_sectors)); - ret =bdrv_pwrite (s->qcow, sector_num *BDRV_SECTOR_SIZE , buf, - nb_sectors *BDRV_SECTOR_SIZE ,0 ); + ret =bdrv_pwrite (s->qcow, sector_num *BDRV_SECTOR_SIZE , + nb_sectors *BDRV_SECTOR_SIZE , buf,0 );if (ret <0 ) {fprintf (stderr,"Error writing to qcow backend\n" );return ret;
include/block/block-io.h +5 -5
@@ -42,12 +42,12 @@int bdrv_pwrite_zeroes (BdrvChild *child,int64_t offset,int64_t bytes,BdrvRequestFlags flags);int bdrv_make_zero (BdrvChild *child,BdrvRequestFlags flags); -int bdrv_pread (BdrvChild *child,int64_t offset,void *buf,int64_t bytes, +int bdrv_pread (BdrvChild *child,int64_t offset,int64_t bytes,void *buf,BdrvRequestFlags flags); -int bdrv_pwrite (BdrvChild *child,int64_t offset,const void *buf, -int64_t bytes,BdrvRequestFlags flags); -int bdrv_pwrite_sync (BdrvChild *child,int64_t offset, -const void *buf,int64_t bytes,BdrvRequestFlags flags); +int bdrv_pwrite (BdrvChild *child,int64_t offset,int64_t bytes, +const void *buf,BdrvRequestFlags flags); +int bdrv_pwrite_sync (BdrvChild *child,int64_t offset,int64_t bytes, +const void *buf,BdrvRequestFlags flags);/* * Efficiently zero a region of the disk image. Note that this is a regular * I/O request like read or write and should have a reasonable size. This
tests/unit/test-block-iothread.c +4 -4
@@ -88,11 +88,11 @@ static void test_sync_op_pread(BdrvChild *c)int ret;/* Success */ - ret =bdrv_pread (c,0 , buf,sizeof (buf),0 ); + ret =bdrv_pread (c,0 ,sizeof (buf), buf,0 ); g_assert_cmpint(ret, ==, 512);/* Early error: Negative offset */ - ret =bdrv_pread (c,-2 , buf,sizeof (buf),0 ); + ret =bdrv_pread (c,-2 ,sizeof (buf), buf,0 ); g_assert_cmpint(ret, ==, -EIO); }
@@ -102,11 +102,11 @@ static void test_sync_op_pwrite(BdrvChild *c)int ret;/* Success */ - ret =bdrv_pwrite (c,0 , buf,sizeof (buf),0 ); + ret =bdrv_pwrite (c,0 ,sizeof (buf), buf,0 ); g_assert_cmpint(ret, ==, 512);/* Early error: Negative offset */ - ret =bdrv_pwrite (c,-2 , buf,sizeof (buf),0 ); + ret =bdrv_pwrite (c,-2 ,sizeof (buf), buf,0 ); g_assert_cmpint(ret, ==, -EIO); }
Signature · 1 line
2.35.3
Re: [PATCH v5 02/10] block: Change bdrv_{pread, pwrite, pwrite_sync}() param order
Quoted 42 lines · Alberto Faria
Swap 'buf' and 'bytes' around for consistency with bdrv_co_{pread,pwrite}(), and in preparation to implement these functions using
generated_co_wrapper.Callers were updated using this Coccinelle script:
@@ expression child, offset, buf, bytes, flags; @@
-bdrv_pread(child, offset, buf, bytes, flags)
+bdrv_pread(child, offset, bytes, buf, flags)@@ expression child, offset, buf, bytes, flags; @@
-bdrv_pwrite(child, offset, buf, bytes, flags)
+bdrv_pwrite(child, offset, bytes, buf, flags)@@ expression child, offset, buf, bytes, flags; @@
-bdrv_pwrite_sync(child, offset, buf, bytes, flags)
+bdrv_pwrite_sync(child, offset, bytes, buf, flags)Resulting overly-long lines were then fixed by hand.
Signed-off-by Alberto Faria <[email protected]>Reviewed-by Paolo Bonzini <[email protected]>Reviewed-by Stefan Hajnoczi <[email protected]>Reviewed-by Vladimir Sementsov-Ogievskiy <[email protected]>--- block/blklogwrites.c | 6 ++-- block/bochs.c | 10 +++--- block/cloop.c | 10 +++--- block/crypto.c | 4 +-- block/dmg.c | 26 +++++++-------- block/io.c | 12 +++---- block/parallels-ext.c | 6 ++-- block/parallels.c | 10 +++--- block/qcow.c | 34 +++++++++---------- block/qcow2-bitmap.c | 14 ++++---- block/qcow2-cache.c | 8 ++--- block/qcow2-cluster.c | 22 ++++++------- block/qcow2-refcount.c | 56 +++++++++++++++++--------------- block/qcow2-snapshot.c | 48 +++++++++++++-------------- block/qcow2.c | 47 ++++++++++++++------------- block/qed.c | 8 ++--- block/vdi.c | 14 ++++----
Quoted 8 lines
block/vhdx-log.c | 18 +++++----- block/vhdx.c | 28 ++++++++-------- block/vmdk.c | 50 ++++++++++++++-------------- block/vpc.c | 22 ++++++------- block/vvfat.c | 10 +++--- include/block/block-io.h | 10 +++--- tests/unit/test-block-iothread.c | 8 ++--- 24 files changed, 242 insertions(+), 239 deletions(-)
PATCH v5 3/10 block: Make bdrv_{pread, pwrite}() return 0 on success
In reply to Alberto FariaThey currently return the value of their 'bytes' parameter on success.
Make them return 0 instead, for consistency with other I/O functions and in preparation to implement them using generated_co_wrapper. This also makes it clear that short reads/writes are not possible.
The few callers that rely on the previous behavior are adjusted accordingly by hand.
--- block/cloop.c | 2 +- block/crypto.c | 4 ++-- block/dmg.c | 10 +++++----- block/io.c | 10 ++-------- block/qcow.c | 2 +- block/qcow2.c | 4 ++-- block/qed.c | 7 +------ block/vdi.c | 2 +- block/vmdk.c | 5 ++--- tests/unit/test-block-iothread.c | 4 ++-- 10 files changed, 19 insertions(+), 31 deletions(-)
block/cloop.c +1 -1
@@ -222,7 +222,7 @@ static inline int cloop_read_block(BlockDriverState *bs, int block_num) ret =bdrv_pread (bs->file, s->offsets[block_num], bytes, s->compressed_block,0 ); -if (ret != bytes) { +if (ret <0 ) {return -1 ; }
block/crypto.c +2 -2
@@ -70,7 +70,7 @@ static ssize_t block_crypto_read_func(QCryptoBlock *block,error_setg_errno (errp, -ret,"Could not read encryption header" );return ret; } -return ret; +return buflen; } static ssize_t block_crypto_write_func(QCryptoBlock *block,
@@ -88,7 +88,7 @@ static ssize_t block_crypto_write_func(QCryptoBlock *block,error_setg_errno (errp, -ret,"Could not write encryption header" );return ret; } -return ret; +return buflen; }
block/dmg.c +5 -5
@@ -390,7 +390,7 @@ static int dmg_read_plist_xml(BlockDriverState *bs, DmgHeaderState *ds, buffer =g_malloc (info_length +1 ); buffer[info_length] ='\0' ; ret =bdrv_pread (bs->file, info_begin, info_length, buffer,0 ); -if (ret != info_length) { +if (ret <0 ) { ret = -EINVAL ; goto fail; }
@@ -611,7 +611,7 @@ static inline int dmg_read_chunk(BlockDriverState *bs, uint64_t sector_num)* inflated. */ ret =bdrv_pread (bs->file, s->offsets[chunk], s->lengths[chunk], s->compressed_chunk,0 ); -if (ret != s->lengths[chunk]) { +if (ret <0 ) {return -1 ; }
@@ -637,7 +637,7 @@ static inline int dmg_read_chunk(BlockDriverState *bs, uint64_t sector_num)* inflated. */ ret =bdrv_pread (bs->file, s->offsets[chunk], s->lengths[chunk], s->compressed_chunk,0 ); -if (ret != s->lengths[chunk]) { +if (ret <0 ) {return -1 ; }
@@ -658,7 +658,7 @@ static inline int dmg_read_chunk(BlockDriverState *bs, uint64_t sector_num)* inflated. */ ret =bdrv_pread (bs->file, s->offsets[chunk], s->lengths[chunk], s->compressed_chunk,0 ); -if (ret != s->lengths[chunk]) { +if (ret <0 ) {return -1 ; }
@@ -674,7 +674,7 @@ static inline int dmg_read_chunk(BlockDriverState *bs, uint64_t sector_num)case UDRW :/* copy */ ret =bdrv_pread (bs->file, s->offsets[chunk], s->lengths[chunk], s->uncompressed_chunk,0 ); -if (ret != s->lengths[chunk]) { +if (ret <0 ) {return -1 ; }break ;
block/io.c +2 -8
@@ -1115,7 +1115,6 @@ int bdrv_make_zero(BdrvChild *child, BdrvRequestFlags flags)int bdrv_pread (BdrvChild *child,int64_t offset,int64_t bytes,void *buf,BdrvRequestFlags flags) { -int ret;QEMUIOVector qiov =QEMU_IOVEC_INIT_BUF (qiov, buf, bytes);IO_CODE ();
@@ -1123,9 +1122,7 @@ int bdrv_pread(BdrvChild *child, int64_t offset, int64_t bytes, void *buf,return -EINVAL ; } - ret =bdrv_preadv (child, offset, bytes, &qiov, flags); - -return ret <0 ? ret : bytes; +return bdrv_preadv (child, offset, bytes, &qiov, flags); }/* Return no. of bytes on success or < 0 on error. Important errors are:
@@ -1137,7 +1134,6 @@ int bdrv_pread(BdrvChild *child, int64_t offset, int64_t bytes, void *buf,int bdrv_pwrite (BdrvChild *child,int64_t offset,int64_t bytes,const void *buf,BdrvRequestFlags flags) { -int ret;QEMUIOVector qiov =QEMU_IOVEC_INIT_BUF (qiov, buf, bytes);IO_CODE ();
@@ -1145,9 +1141,7 @@ int bdrv_pwrite(BdrvChild *child, int64_t offset, int64_t bytes,return -EINVAL ; } - ret =bdrv_pwritev (child, offset, bytes, &qiov, flags); - -return ret <0 ? ret : bytes; +return bdrv_pwritev (child, offset, bytes, &qiov, flags); }/*
block/qcow.c +1 -1
@@ -597,7 +597,7 @@ static int decompress_cluster(BlockDriverState *bs, uint64_t cluster_offset) csize &= (s->cluster_size -1 );BLKDBG_EVENT (bs->file,BLKDBG_READ_COMPRESSED ); ret =bdrv_pread (bs->file, coffset, csize, s->cluster_data,0 ); -if (ret != csize) +if (ret <0 )return -1 ;if (decompress_buffer (s->cluster_cache, s->cluster_size, s->cluster_data, csize) <0 ) {
block/qcow2.c +2 -2
@@ -113,7 +113,7 @@ static ssize_t qcow2_crypto_hdr_read_func(QCryptoBlock *block, size_t offset,error_setg_errno (errp, -ret,"Could not read encryption header" );return -1 ; } -return ret; +return buflen; }
@@ -174,7 +174,7 @@ static ssize_t qcow2_crypto_hdr_write_func(QCryptoBlock *block, size_t offset,error_setg_errno (errp, -ret,"Could not read encryption header" );return -1 ; } -return ret; +return buflen; } static QDict*
block/qed.c +1 -6
@@ -87,14 +87,9 @@ static void qed_header_cpu_to_le(const QEDHeader *cpu, QEDHeader *le)int qed_write_header_sync (BDRVQEDState *s) {QEDHeader le; -int ret;qed_header_cpu_to_le (&s->header, &le); - ret =bdrv_pwrite (s->bs->file,0 ,sizeof (le), &le,0 ); -if (ret !=sizeof (le)) { -return ret; - } -return 0 ; +return bdrv_pwrite (s->bs->file,0 ,sizeof (le), &le,0 ); }/**
block/vdi.c +1 -1
@@ -730,7 +730,7 @@ nonallocating_write: n_sectors * SECTOR_SIZE, base, 0); } -return ret <0 ? ret :0 ; +return ret; } static int coroutine_fn vdi_co_do_create(BlockdevCreateOptions *create_options,
block/vmdk.c +2 -3
@@ -473,7 +473,6 @@ static int vmdk_parent_open(BlockDriverState *bs)if (ret <0 ) { goto out; } - ret =0 ; p_name =strstr (desc,"parentFileNameHint" );if (p_name !=NULL ) {
@@ -905,7 +904,7 @@ static char *vmdk_read_desc(BdrvChild *file, uint64_t desc_offset, Error **errp)g_free (buf);return NULL ; } - buf[ret] =0 ; + buf[size] =0 ;return buf; }
@@ -1630,7 +1629,7 @@ static int get_cluster_offset(BlockDriverState *bs, l2_size_bytes, l2_table, 0 - ) != l2_size_bytes) { + ) < 0) {return VMDK_ERROR ; }
tests/unit/test-block-iothread.c +2 -2
@@ -89,7 +89,7 @@ static void test_sync_op_pread(BdrvChild *c)/* Success */ ret =bdrv_pread (c,0 ,sizeof (buf), buf,0 ); - g_assert_cmpint(ret, ==, 512); + g_assert_cmpint(ret, ==, 0);/* Early error: Negative offset */ ret =bdrv_pread (c,-2 ,sizeof (buf), buf,0 );
@@ -103,7 +103,7 @@ static void test_sync_op_pwrite(BdrvChild *c)/* Success */ ret =bdrv_pwrite (c,0 ,sizeof (buf), buf,0 ); - g_assert_cmpint(ret, ==, 512); + g_assert_cmpint(ret, ==, 0);/* Early error: Negative offset */ ret =bdrv_pwrite (c,-2 ,sizeof (buf), buf,0 );
Signature · 1 line
2.35.3
Re: [PATCH v5 03/10] block: Make bdrv_{pread,pwrite}() return 0 on success
Quoted 12 lines · Alberto Faria
They currently return the value of their 'bytes' parameter on success.
Make them return 0 instead, for consistency with other I/O functions and in preparation to implement them using
generated_co_wrapper. This also makes it clear that short reads/writes are not possible.The few callers that rely on the previous behavior are adjusted accordingly by hand.
Signed-off-by Alberto Faria <[email protected]>Reviewed-by Paolo Bonzini <[email protected]>Reviewed-by Stefan Hajnoczi <[email protected]>
Quoted 12 lines
--- block/cloop.c | 2 +- block/crypto.c | 4 ++-- block/dmg.c | 10 +++++----- block/io.c | 10 ++-------- block/qcow.c | 2 +- block/qcow2.c | 4 ++-- block/qed.c | 7 +------ block/vdi.c | 2 +- block/vmdk.c | 5 ++--- tests/unit/test-block-iothread.c | 4 ++-- 10 files changed, 19 insertions(+), 31 deletions(-)
PATCH v5 4/10 crypto: Make block callbacks return 0 on success
In reply to Alberto FariaThey currently return the value of their headerlen/buflen parameter on success. Returning 0 instead makes it clear that short reads/writes are not possible.
--- block/crypto.c | 52 +++++++++++++++++----------------- block/qcow2.c | 22 +++++++------- crypto/block-luks.c | 8 +++--- crypto/block.c | 6 ++-- include/crypto/block.h | 32 ++++++++++----------- tests/unit/test-crypto-block.c | 38 ++++++++++++------------- 6 files changed, 79 insertions(+), 79 deletions(-)
block/crypto.c +26 -26
@@ -55,12 +55,12 @@ static int block_crypto_probe_generic(QCryptoBlockFormat format, } -static ssize_t block_crypto_read_func (QCryptoBlock *block, -size_t offset, -uint8_t *buf, -size_t buflen, -void *opaque, -Error **errp) +static int block_crypto_read_func (QCryptoBlock *block, +size_t offset, +uint8_t *buf, +size_t buflen, +void *opaque, +Error **errp) {BlockDriverState *bs = opaque;ssize_t ret;
@@ -70,15 +70,15 @@ static ssize_t block_crypto_read_func(QCryptoBlock *block,error_setg_errno (errp, -ret,"Could not read encryption header" );return ret; } -return buflen; +return 0 ; } -static ssize_t block_crypto_write_func (QCryptoBlock *block, -size_t offset, -const uint8_t *buf, -size_t buflen, -void *opaque, -Error **errp) +static int block_crypto_write_func (QCryptoBlock *block, +size_t offset, +const uint8_t *buf, +size_t buflen, +void *opaque, +Error **errp) {BlockDriverState *bs = opaque;ssize_t ret;
@@ -88,7 +88,7 @@ static ssize_t block_crypto_write_func(QCryptoBlock *block,error_setg_errno (errp, -ret,"Could not write encryption header" );return ret; } -return buflen; +return 0 ; }
@@ -99,12 +99,12 @@ struct BlockCryptoCreateData { }; -static ssize_t block_crypto_create_write_func (QCryptoBlock *block, -size_t offset, -const uint8_t *buf, -size_t buflen, -void *opaque, -Error **errp) +static int block_crypto_create_write_func (QCryptoBlock *block, +size_t offset, +const uint8_t *buf, +size_t buflen, +void *opaque, +Error **errp) {struct BlockCryptoCreateData *data = opaque;ssize_t ret;
@@ -114,13 +114,13 @@ static ssize_t block_crypto_create_write_func(QCryptoBlock *block,error_setg_errno (errp, -ret,"Could not write encryption header" );return ret; } -return ret; +return 0 ; } -static ssize_t block_crypto_create_init_func (QCryptoBlock *block, -size_t headerlen, -void *opaque, -Error **errp) +static int block_crypto_create_init_func (QCryptoBlock *block, +size_t headerlen, +void *opaque, +Error **errp) {struct BlockCryptoCreateData *data = opaque;Error *local_error =NULL ;
@@ -139,7 +139,7 @@ static ssize_t block_crypto_create_init_func(QCryptoBlock *block, data->prealloc, 0, &local_error);if (ret >=0 ) { -return ret; +return 0 ; } error:
block/qcow2.c +11 -11
@@ -94,9 +94,9 @@ static int qcow2_probe(const uint8_t *buf, int buf_size, const char *filename) } -static ssize_t qcow2_crypto_hdr_read_func (QCryptoBlock *block,size_t offset, -uint8_t *buf,size_t buflen, -void *opaque,Error **errp) +static int qcow2_crypto_hdr_read_func (QCryptoBlock *block,size_t offset, +uint8_t *buf,size_t buflen, +void *opaque,Error **errp) {BlockDriverState *bs = opaque;BDRVQcow2State *s = bs->opaque;
@@ -113,12 +113,12 @@ static ssize_t qcow2_crypto_hdr_read_func(QCryptoBlock *block, size_t offset,error_setg_errno (errp, -ret,"Could not read encryption header" );return -1 ; } -return buflen; +return 0 ; } -static ssize_t qcow2_crypto_hdr_init_func (QCryptoBlock *block,size_t headerlen, -void *opaque,Error **errp) +static int qcow2_crypto_hdr_init_func (QCryptoBlock *block,size_t headerlen, +void *opaque,Error **errp) {BlockDriverState *bs = opaque;BDRVQcow2State *s = bs->opaque;
@@ -151,13 +151,13 @@ static ssize_t qcow2_crypto_hdr_init_func(QCryptoBlock *block, size_t headerlen,return -1 ; } -return ret; +return 0 ; } -static ssize_t qcow2_crypto_hdr_write_func (QCryptoBlock *block,size_t offset, -const uint8_t *buf,size_t buflen, -void *opaque,Error **errp) +static int qcow2_crypto_hdr_write_func (QCryptoBlock *block,size_t offset, +const uint8_t *buf,size_t buflen, +void *opaque,Error **errp) {BlockDriverState *bs = opaque;BDRVQcow2State *s = bs->opaque;
@@ -174,7 +174,7 @@ static ssize_t qcow2_crypto_hdr_write_func(QCryptoBlock *block, size_t offset,error_setg_errno (errp, -ret,"Could not read encryption header" );return -1 ; } -return buflen; +return 0 ; } static QDict*
crypto/block-luks.c +4 -4
@@ -495,7 +495,7 @@ qcrypto_block_luks_load_header(QCryptoBlock *block,void *opaque, Error **errp) { - ssize_t rv; + int rv;size_t i;QCryptoBlockLUKS *luks = block->opaque;
@@ -856,7 +856,7 @@ qcrypto_block_luks_store_key(QCryptoBlock *block, QCRYPTO_BLOCK_LUKS_SECTOR_SIZE, splitkey, splitkeylen, opaque, - errp) != splitkeylen) { + errp) < 0) { goto cleanup; }
@@ -903,7 +903,7 @@ qcrypto_block_luks_load_key(QCryptoBlock *block, g_autofree uint8_t *splitkey = NULL;size_t splitkeylen; g_autofree uint8_t *possiblekey = NULL; -ssize_t rv; +int rv;g_autoptr (QCryptoCipher) cipher =NULL ;uint8_t keydigest[QCRYPTO_BLOCK_LUKS_DIGEST_LEN ];g_autoptr (QCryptoIVGen) ivgen =NULL ;
@@ -1193,7 +1193,7 @@ qcrypto_block_luks_erase_key(QCryptoBlock *block, garbagesplitkey, splitkeylen, opaque, - &local_err) != splitkeylen) { + &local_err) < 0) {error_propagate (errp ,local_err );return -1 ; }
crypto/block.c +3 -3
@@ -115,7 +115,7 @@ QCryptoBlock *qcrypto_block_create(QCryptoBlockCreateOptions *options, } -static ssize_t qcrypto_block_headerlen_hdr_init_func (QCryptoBlock *block, +static int qcrypto_block_headerlen_hdr_init_func (QCryptoBlock *block,size_t headerlen,void *opaque,Error **errp) {size_t *headerlenp = opaque;
@@ -126,12 +126,12 @@ static ssize_t qcrypto_block_headerlen_hdr_init_func(QCryptoBlock *block, } -static ssize_t qcrypto_block_headerlen_hdr_write_func (QCryptoBlock *block, +static int qcrypto_block_headerlen_hdr_write_func (QCryptoBlock *block,size_t offset,const uint8_t *buf,size_t buflen,void *opaque,Error **errp) {/* Discard the bytes, we're not actually writing to an image */ -return buflen; +return 0 ; }
include/crypto/block.h +16 -16
@@ -29,24 +29,24 @@ typedef struct QCryptoBlock QCryptoBlock;/* See also QCryptoBlockFormat, QCryptoBlockCreateOptions * and QCryptoBlockOpenOptions in qapi/crypto.json */ -typedef ssize_t (*QCryptoBlockReadFunc )(QCryptoBlock *block, -size_t offset, -uint8_t *buf, -size_t buflen, -void *opaque, -Error **errp); +typedef int (*QCryptoBlockReadFunc )(QCryptoBlock *block, +size_t offset, +uint8_t *buf, +size_t buflen, +void *opaque, +Error **errp); -typedef ssize_t (*QCryptoBlockInitFunc )(QCryptoBlock *block, -size_t headerlen, -void *opaque, -Error **errp); +typedef int (*QCryptoBlockInitFunc )(QCryptoBlock *block, +size_t headerlen, +void *opaque, +Error **errp); -typedef ssize_t (*QCryptoBlockWriteFunc )(QCryptoBlock *block, -size_t offset, -const uint8_t *buf, -size_t buflen, -void *opaque, -Error **errp); +typedef int (*QCryptoBlockWriteFunc )(QCryptoBlock *block, +size_t offset, +const uint8_t *buf, +size_t buflen, +void *opaque, +Error **errp);/** * qcrypto_block_has_format:
tests/unit/test-crypto-block.c +19 -19
@@ -188,12 +188,12 @@ static struct QCryptoBlockTestData { }; -static ssize_t test_block_read_func (QCryptoBlock *block, -size_t offset, -uint8_t *buf, -size_t buflen, -void *opaque, -Error **errp) +static int test_block_read_func (QCryptoBlock *block, +size_t offset, +uint8_t *buf, +size_t buflen, +void *opaque, +Error **errp) {Buffer *header = opaque;
@@ -201,14 +201,14 @@ static ssize_t test_block_read_func(QCryptoBlock *block,memcpy (buf, header->buffer + offset, buflen); -return buflen; +return 0 ; } -static ssize_t test_block_init_func (QCryptoBlock *block, -size_t headerlen, -void *opaque, -Error **errp) +static int test_block_init_func (QCryptoBlock *block, +size_t headerlen, +void *opaque, +Error **errp) {Buffer *header = opaque;
@@ -216,16 +216,16 @@ static ssize_t test_block_init_func(QCryptoBlock *block,buffer_reserve (header, headerlen); -return headerlen; +return 0 ; } -static ssize_t test_block_write_func (QCryptoBlock *block, -size_t offset, -const uint8_t *buf, -size_t buflen, -void *opaque, -Error **errp) +static int test_block_write_func (QCryptoBlock *block, +size_t offset, +const uint8_t *buf, +size_t buflen, +void *opaque, +Error **errp) {Buffer *header = opaque;
@@ -234,7 +234,7 @@ static ssize_t test_block_write_func(QCryptoBlock *block,memcpy (header->buffer + offset, buf, buflen); header->offset = offset + buflen; -return buflen; +return 0 ; }
Signature · 1 line
2.35.3
Re: [PATCH v5 04/10] crypto: Make block callbacks return 0 on success
Quoted 7 lines · Alberto Faria
They currently return the value of their headerlen/buflen parameter on success. Returning 0 instead makes it clear that short reads/writes are not possible.
Signed-off-by Alberto Faria <[email protected]>Reviewed-by Eric Blake <[email protected]>Reviewed-by Stefan Hajnoczi <[email protected]>
Quoted 8 lines
--- block/crypto.c | 52 +++++++++++++++++----------------- block/qcow2.c | 22 +++++++------- crypto/block-luks.c | 8 +++--- crypto/block.c | 6 ++-- include/crypto/block.h | 32 ++++++++++----------- tests/unit/test-crypto-block.c | 38 ++++++++++++------------- 6 files changed, 79 insertions(+), 79 deletions(-)
PATCH v5 5/10 block: Make bdrv_co_pwrite() take a const buffer
In reply to Alberto FariaIt does not mutate the buffer.
--- include/block/block_int-io.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/block/block_int-io.h +1 -1
@@ -65,7 +65,7 @@ static inline int coroutine_fn bdrv_co_pread(BdrvChild *child, } static inline int coroutine_fn bdrv_co_pwrite(BdrvChild *child, -int64_t offset,unsigned int bytes,void *buf,BdrvRequestFlags flags) +int64_t offset,unsigned int bytes,const void *buf,BdrvRequestFlags flags) {QEMUIOVector qiov =QEMU_IOVEC_INIT_BUF (qiov, buf, bytes);IO_CODE ();
Signature · 1 line
2.35.3
Re: [PATCH v5 05/10] block: Make bdrv_co_pwrite() take a const buffer
Quoted 8 lines · Alberto Faria
It does not mutate the buffer.
Signed-off-by Alberto Faria <[email protected]>Reviewed-by Paolo Bonzini <[email protected]>Reviewed-by Stefan Hajnoczi <[email protected]>--- include/block/block_int-io.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
PATCH v5 6/10 block: Make 'bytes' param of bdrv_co_{pread, pwrite, preadv, pwritev}() an int64_t
In reply to Alberto FariaFor consistency with other I/O functions, and in preparation to implement bdrv_{pread,pwrite}() using generated_co_wrapper.
unsigned int fits in int64_t, so all callers remain correct.
bdrv_check_request32() is called further down the stack and causes -EIO to be returned if 'bytes' is negative or greater than BDRV_REQUEST_MAX_BYTES, which in turns never exceeds SIZE_MAX.
--- block/coroutines.h | 4 ++-- include/block/block_int-io.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
block/coroutines.h +2 -2
@@ -91,11 +91,11 @@ int coroutine_fn blk_co_do_flush(BlockBackend *blk);*/ int generated_co_wrapper -bdrv_preadv (BdrvChild *child,int64_t offset,unsigned int bytes, +bdrv_preadv (BdrvChild *child,int64_t offset,int64_t bytes,QEMUIOVector *qiov,BdrvRequestFlags flags); int generated_co_wrapper -bdrv_pwritev (BdrvChild *child,int64_t offset,unsigned int bytes, +bdrv_pwritev (BdrvChild *child,int64_t offset,int64_t bytes,QEMUIOVector *qiov,BdrvRequestFlags flags);int generated_co_wrapper
include/block/block_int-io.h +2 -2
@@ -56,7 +56,7 @@ int coroutine_fn bdrv_co_pwritev_part(BdrvChild *child, QEMUIOVector *qiov, size_t qiov_offset, BdrvRequestFlags flags); static inline int coroutine_fn bdrv_co_pread(BdrvChild *child, -int64_t offset,unsigned int bytes,void *buf,BdrvRequestFlags flags) +int64_t offset,int64_t bytes,void *buf,BdrvRequestFlags flags) {QEMUIOVector qiov =QEMU_IOVEC_INIT_BUF (qiov, buf, bytes);IO_CODE ();
@@ -65,7 +65,7 @@ static inline int coroutine_fn bdrv_co_pread(BdrvChild *child, } static inline int coroutine_fn bdrv_co_pwrite(BdrvChild *child, -int64_t offset,unsigned int bytes,const void *buf,BdrvRequestFlags flags) +int64_t offset,int64_t bytes,const void *buf,BdrvRequestFlags flags) {QEMUIOVector qiov =QEMU_IOVEC_INIT_BUF (qiov, buf, bytes);IO_CODE ();
Signature · 1 line
2.35.3
Re: [PATCH v5 06/10] block: Make 'bytes' param of bdrv_co_{pread,pwrite,preadv,pwritev}() an int64_t
Quoted 9 lines · Alberto Faria
For consistency with other I/O functions, and in preparation to implement bdrv_{pread,pwrite}() using
generated_co_wrapper.unsigned int fits in
int64_t, so all callers remain correct.
bdrv_check_request32()is called further down the stack and causes-EIOto be returned if 'bytes' is negative or greater thanBDRV_REQUEST_MAX_BYTES, which in turns never exceedsSIZE_MAX.
Quoted 6 lines
Signed-off-by Alberto Faria <[email protected]>--- block/coroutines.h | 4 ++-- include/block/block_int-io.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org
Re: [PATCH v5 06/10] block: Make 'bytes' param of bdrv_co_{pread,pwrite,preadv,pwritev}() an int64_t
In reply to Alberto FariaQuoted 8 lines · Alberto Faria
For consistency with other I/O functions, and in preparation to implement bdrv_{pread,pwrite}() using
generated_co_wrapper.unsigned int fits in
int64_t, so all callers remain correct.
bdrv_check_request32()is called further down the stack and causes-EIOto be returned if 'bytes' is negative or greater thanBDRV_REQUEST_MAX_BYTES, which in turns never exceedsSIZE_MAX.
I’m not a huge fan of that reasoning alone. I don’t like generating an object that will be invalid if bytes > SIZE_MAX, and then rely on some later check in a different context verifying that bytes <= SIZE_MAX. In theory, if the latter check is removed, we might forget caring for the former. (In practice, such a case (where I/O vectors remain using size_t, but we allow for larger overall requests) is difficult to imagine, though.)
However, bdrv_check_request32() also calls bdrv_check_qiov_request(), which verifies the integrity of qiov by checking that bytes will not exceed qiov->size - qiov_offset. So if we had any overflow when casting bytes to size_t, it’ll be seen there directly (and I don’t see why we’d remove that specific check).
Given that, and given that there’s precedent (e.g. bdrv_pread()), I’m OK with the change.
PATCH v5 7/10 block: Implement bdrv_{pread, pwrite, pwrite_zeroes}() using generated_co_wrapper
In reply to Alberto Fariabdrv_{pread,pwrite}() now return -EIO instead of -EINVAL when 'bytes' is negative, making them consistent with bdrv_{preadv,pwritev}() and bdrv_co_{pread,pwrite,preadv,pwritev}().
bdrv_pwrite_zeroes() now also calls trace_bdrv_co_pwrite_zeroes() and clears the BDRV_REQ_MAY_UNMAP flag when appropriate, which it didn't previously.
---
I audited all bdrv_{pread,pwrite}() callers to make sure that changing the -EINVAL return code to -EIO wont't break things. However, there are about 140 call sites, so the probability of me having missed something isn't negligible. If someone more accustomed to the code base is able to double-check this, that would be very much appreciated.
As a precaution, I also dropped Paolo's R-b.
block/io.c | 41 ---------------------------------------- include/block/block-io.h | 15 +++++++++------ 2 files changed, 9 insertions(+), 47 deletions(-)
block/io.c +0 -41
@@ -1061,14 +1061,6 @@ static int bdrv_check_request32(int64_t offset, int64_t bytes,return 0 ; } -int bdrv_pwrite_zeroes (BdrvChild *child,int64_t offset, -int64_t bytes,BdrvRequestFlags flags) -{ -IO_CODE (); -return bdrv_pwritev (child, offset, bytes,NULL , -BDRV_REQ_ZERO_WRITE | flags); -} -/* * Completely zero out a block device with the help of bdrv_pwrite_zeroes. * The operation is sped up by checking the block status and only writing
@@ -1111,39 +1103,6 @@ int bdrv_make_zero(BdrvChild *child, BdrvRequestFlags flags) } } -/* See bdrv_pwrite() for the return codes */ -int bdrv_pread (BdrvChild *child,int64_t offset,int64_t bytes,void *buf, -BdrvRequestFlags flags) -{ -QEMUIOVector qiov =QEMU_IOVEC_INIT_BUF (qiov, buf, bytes); -IO_CODE (); - -if (bytes <0 ) { -return -EINVAL ; - } - -return bdrv_preadv (child, offset, bytes, &qiov, flags); -} - -/* Return no. of bytes on success or < 0 on error. Important errors are: --EIO generic I/O error (may happen for all errors) --ENOMEDIUM No media inserted. --EINVAL Invalid offset or number of bytes --EACCES Trying to write a read-only device -*/ -int bdrv_pwrite (BdrvChild *child,int64_t offset,int64_t bytes, -const void *buf,BdrvRequestFlags flags) -{ -QEMUIOVector qiov =QEMU_IOVEC_INIT_BUF (qiov, buf, bytes); -IO_CODE (); - -if (bytes <0 ) { -return -EINVAL ; - } - -return bdrv_pwritev (child, offset, bytes, &qiov, flags); -} -/* * Writes to the file and ensures that no writes are reordered across this * request (acts as a barrier)
include/block/block-io.h +9 -6
@@ -39,13 +39,16 @@* to catch when they are accidentally called by the wrong API. */ -int bdrv_pwrite_zeroes (BdrvChild *child,int64_t offset, -int64_t bytes,BdrvRequestFlags flags); +int generated_co_wrapper bdrv_pwrite_zeroes(BdrvChild *child, int64_t offset, +int64_t bytes, +BdrvRequestFlags flags);int bdrv_make_zero (BdrvChild *child,BdrvRequestFlags flags); -int bdrv_pread (BdrvChild *child,int64_t offset,int64_t bytes,void *buf, -BdrvRequestFlags flags); -int bdrv_pwrite (BdrvChild *child,int64_t offset,int64_t bytes, -const void *buf,BdrvRequestFlags flags); +int generated_co_wrapper bdrv_pread(BdrvChild *child, int64_t offset, +int64_t bytes,void *buf, +BdrvRequestFlags flags); +int generated_co_wrapper bdrv_pwrite(BdrvChild *child, int64_t offset, +int64_t bytes,const void *buf, +BdrvRequestFlags flags);int bdrv_pwrite_sync (BdrvChild *child,int64_t offset,int64_t bytes,const void *buf,BdrvRequestFlags flags);/*
Signature · 1 line
2.35.3
Re: [PATCH v5 07/10] block: Implement bdrv_{pread,pwrite,pwrite_zeroes}() using generated_co_wrapper
Quoted 8 lines · Alberto Faria
bdrv_{pread,pwrite}() now return
-EIOinstead of-EINVALwhen 'bytes' is negative, making them consistent with bdrv_{preadv,pwritev}() and bdrv_co_{pread,pwrite,preadv,pwritev}().
bdrv_pwrite_zeroes()now also callstrace_bdrv_co_pwrite_zeroes()and clears theBDRV_REQ_MAY_UNMAPflag when appropriate, which it didn't previously.
Quoted 8 lines
Signed-off-by Alberto Faria <[email protected]>---
I audited all bdrv_{pread,pwrite}() callers to make sure that changing the
-EINVALreturn code to-EIOwont't break things. However, there are about 140 call sites, so the probability of me having missed something isn't negligible. If someone more accustomed to the code base is able to double-check this, that would be very much appreciated.
I did not get through all of the callers (you are right, there ARE a lot), but the ones I checked, particularly in block/qcow2-*.c, appear to handle -EIO just fine.
I did notice, however, that qcow2-bitmap.c:free_bitmap_clusters() returns an int failure, but none of its three callers (qcow2_co_remove_persistent_dirty_bitmap, and twice in qcow2_store_persistent_dirty_bitmaps) care about the return value. That may be worth a separate cleanup patch.
Quoted 6 lines
As a precaution, I also dropped Paolo's R-b.
block/io.c | 41 ---------------------------------------- include/block/block-io.h | 15 +++++++++------ 2 files changed, 9 insertions(+), 47 deletions(-)
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org
Re: [PATCH v5 07/10] block: Implement bdrv_{pread, pwrite, pwrite_zeroes}() using generated_co_wrapper
Quoted 9 lines · Eric Blake
I did not get through all of the callers (you are right, there ARE a lot), but the ones I checked, particularly in
block/qcow2-*.c, appear to handle-EIOjust fine.I did notice, however, that qcow2-bitmap.c:free_bitmap_clusters() returns an int failure, but none of its three callers (
qcow2_co_remove_persistent_dirty_bitmap, and twice inqcow2_store_persistent_dirty_bitmaps) care about the return value. That may be worth a separate cleanup patch.
Thanks, Eric. I decided to add a check for this kind of thing to the static analyzer I've been working on, which I sent as an RFC [1].
Alberto
Re: [PATCH v5 07/10] block: Implement bdrv_{pread,pwrite,pwrite_zeroes}() using generated_co_wrapper
In reply to Alberto FariaQuoted 8 lines · Alberto Faria
bdrv_{pread,pwrite}() now return
-EIOinstead of-EINVALwhen 'bytes' is negative, making them consistent with bdrv_{preadv,pwritev}() and bdrv_co_{pread,pwrite,preadv,pwritev}().
bdrv_pwrite_zeroes()now also callstrace_bdrv_co_pwrite_zeroes()and clears theBDRV_REQ_MAY_UNMAPflag when appropriate, which it didn't previously.
Quoted 8 lines
Signed-off-by Alberto Faria <[email protected]>---
I audited all bdrv_{pread,pwrite}() callers to make sure that changing the
-EINVALreturn code to-EIOwont't break things. However, there are about 140 call sites, so the probability of me having missed something isn't negligible. If someone more accustomed to the code base is able to double-check this, that would be very much appreciated.
FWIW I checked all call sits when reviewing patch 3, and I can’t remember any case where the follow-up check was anything but ret < 0. The only difference should be a couple of error_setg_errno() calls, which will change from “Invalid argument” to “I/O error”.
I guess the real problem wouldn’t be checking the immediate call sites, but the fact that most call sites just pass the error code to their caller in turn, and that’s really something that’s unreasonable to check, I believe.
Honestly, I don’t think it really matters (how likely is bytes < 0?), nor could I imagine a case where EINVAL vs. EIO would cause any difference in behavior. That’s to say, I’d be disappointed if it did.
(Grepping for 'if.*EINVAL' and 'if.*EIO' in block/ only yields one case in block/nbd.c where I can’t quickly absolutely rule out it won’t make a difference, but I think that check is only for error codes coming from handling network requests.)
Quoted 5 lines
As a precaution, I also dropped Paolo's R-b.
block/io.c | 41 ---------------------------------------- include/block/block-io.h | 15 +++++++++------ 2 files changed, 9 insertions(+), 47 deletions(-)
PATCH v5 8/10 block: Add bdrv_co_pwrite_sync()
In reply to Alberto FariaAlso convert bdrv_pwrite_sync() to being implemented using generated_co_wrapper.
--- block/io.c | 9 +++++---- include/block/block-io.h | 8 ++++++-- 2 files changed, 11 insertions(+), 6 deletions(-)
block/io.c +5 -4
@@ -1109,18 +1109,19 @@ int bdrv_make_zero(BdrvChild *child, BdrvRequestFlags flags)* * Returns 0 on success, -errno in error cases. */ -int bdrv_pwrite_sync (BdrvChild *child,int64_t offset,int64_t bytes, -const void *buf,BdrvRequestFlags flags) +int coroutine_fn bdrv_co_pwrite_sync(BdrvChild *child, int64_t offset, +int64_t bytes,const void *buf, +BdrvRequestFlags flags) {int ret;IO_CODE (); - ret =bdrv_pwrite (child, offset, bytes, buf, flags); + ret =bdrv_co_pwrite (child, offset, bytes, buf, flags);if (ret <0 ) {return ret; } - ret =bdrv_flush (child->bs); + ret =bdrv_co_flush (child->bs);if (ret <0 ) {return ret; }
include/block/block-io.h +6 -2
@@ -49,8 +49,12 @@ int generated_co_wrapper bdrv_pread(BdrvChild *child, int64_t offset, int generated_co_wrapper bdrv_pwrite(BdrvChild *child, int64_t offset,int64_t bytes,const void *buf,BdrvRequestFlags flags); -int bdrv_pwrite_sync (BdrvChild *child,int64_t offset,int64_t bytes, -const void *buf,BdrvRequestFlags flags); +int generated_co_wrapper bdrv_pwrite_sync(BdrvChild *child, int64_t offset, +int64_t bytes,const void *buf, +BdrvRequestFlags flags); +int coroutine_fn bdrv_co_pwrite_sync(BdrvChild *child, int64_t offset, +int64_t bytes,const void *buf, +BdrvRequestFlags flags);/* * Efficiently zero a region of the disk image. Note that this is a regular * I/O request like read or write and should have a reasonable size. This
Signature · 1 line
2.35.3
Re: [PATCH v5 08/10] block: Add bdrv_co_pwrite_sync()
Quoted 10 lines · Alberto Faria
Also convert
bdrv_pwrite_sync()to being implemented usinggenerated_co_wrapper.Signed-off-by Alberto Faria <[email protected]>Reviewed-by Eric Blake <[email protected]>Reviewed-by Stefan Hajnoczi <[email protected]>--- block/io.c | 9 +++++---- include/block/block-io.h | 8 ++++++-- 2 files changed, 11 insertions(+), 6 deletions(-)
PATCH v5 9/10 block: Use bdrv_co_pwrite_sync() when caller is coroutine_fn
In reply to Alberto FariaConvert uses of bdrv_pwrite_sync() into bdrv_co_pwrite_sync() when the callers are already coroutine_fn.
--- block/parallels.c | 2 +- block/qcow2-snapshot.c | 6 +++--- block/qcow2.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-)
block/parallels.c +1 -1
@@ -481,7 +481,7 @@ static int coroutine_fn parallels_co_check(BlockDriverState *bs, ret =0 ;if (flush_bat) { - ret =bdrv_pwrite_sync (bs->file,0 , s->header_size, s->header,0 ); + ret =bdrv_co_pwrite_sync (bs->file,0 , s->header_size, s->header,0 );if (ret <0 ) { res->check_errors++; goto out;
block/qcow2-snapshot.c +3 -3
@@ -512,9 +512,9 @@ int coroutine_fn qcow2_check_read_snapshot_table(BlockDriverState *bs,assert (fix &BDRV_FIX_ERRORS ); snapshot_table_pointer.nb_snapshots =cpu_to_be32 (s->nb_snapshots); - ret =bdrv_pwrite_sync (bs->file, offsetof(QCowHeader , nb_snapshots), -sizeof (snapshot_table_pointer.nb_snapshots), - &snapshot_table_pointer.nb_snapshots,0 ); + ret =bdrv_co_pwrite_sync (bs->file, offsetof(QCowHeader , nb_snapshots), +sizeof (snapshot_table_pointer.nb_snapshots), + &snapshot_table_pointer.nb_snapshots,0 );if (ret <0 ) { result->check_errors++; fprintf(stderr, "ERROR failed to update the snapshot count in the "
block/qcow2.c +2 -2
@@ -4551,8 +4551,8 @@ static int coroutine_fn qcow2_co_truncate(BlockDriverState *bs, int64_t offset,/* write updated header.size */ offset =cpu_to_be64 (offset); - ret =bdrv_pwrite_sync (bs->file, offsetof(QCowHeader , size), -sizeof (offset), &offset,0 ); + ret =bdrv_co_pwrite_sync (bs->file, offsetof(QCowHeader , size), +sizeof (offset), &offset,0 );if (ret <0 ) {error_setg_errno (errp, -ret,"Failed to update the image size" ); goto fail;
Signature · 1 line
2.35.3
Re: [PATCH v5 09/10] block: Use bdrv_co_pwrite_sync() when caller is coroutine_fn
Quoted 11 lines · Alberto Faria
Convert uses of
bdrv_pwrite_sync()intobdrv_co_pwrite_sync()when the callers are alreadycoroutine_fn.Signed-off-by Alberto Faria <[email protected]>Reviewed-by Vladimir Sementsov-Ogievskiy <[email protected]>Reviewed-by Stefan Hajnoczi <[email protected]>--- block/parallels.c | 2 +- block/qcow2-snapshot.c | 6 +++--- block/qcow2.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-)
PATCH v5 10/10 block/qcow2: Use bdrv_pwrite_sync() in qcow2_mark_dirty()
In reply to Alberto FariaUse bdrv_pwrite_sync() instead of calling bdrv_pwrite() and bdrv_flush() separately.
--- block/qcow2.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
block/qcow2.c +3 -6
@@ -516,12 +516,9 @@ int qcow2_mark_dirty(BlockDriverState *bs) } val =cpu_to_be64 (s->incompatible_features |QCOW2_INCOMPAT_DIRTY ); - ret =bdrv_pwrite (bs->file, offsetof(QCowHeader , incompatible_features), -sizeof (val), &val,0 ); -if (ret <0 ) { -return ret; - } - ret =bdrv_flush (bs->file->bs); + ret =bdrv_pwrite_sync (bs->file, + offsetof(QCowHeader , incompatible_features), +sizeof (val), &val,0 );if (ret <0 ) {return ret; }
Signature · 1 line
2.35.3
Re: [PATCH v5 10/10] block/qcow2: Use bdrv_pwrite_sync() in qcow2_mark_dirty()
Quoted 9 lines · Alberto Faria
Use
bdrv_pwrite_sync()instead of callingbdrv_pwrite()andbdrv_flush()separately.Signed-off-by Alberto Faria <[email protected]>Reviewed-by Eric Blake <[email protected]>Reviewed-by Stefan Hajnoczi <[email protected]>--- block/qcow2.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
Quoted 6 lines · Alberto Faria
Start by making the interfaces of analogous non-coroutine and coroutine functions consistent with each other, then implement the non-coroutine ones using
generated_co_wrapper.For the
bdrv_pwrite_sync()case, also add the missingbdrv_co_pwrite_sync()function.
A gentle ping.
Quoted 9 lines · Alberto Faria
Quoted 6 lines · Alberto Faria
Start by making the interfaces of analogous non-coroutine and coroutine functions consistent with each other, then implement the non-coroutine ones using
generated_co_wrapper.For the
bdrv_pwrite_sync()case, also add the missingbdrv_co_pwrite_sync()function.A gentle ping.
Stefan, Kevin, Hanna?
Paolo
Hanna Reitz
AppliedRe: [PATCH v5 00/10] Implement bdrv_{pread,pwrite,pwrite_sync,pwrite_zeroes}() using generated_co_wrapper
In reply to Alberto FariaQuoted 6 lines · Alberto Faria
Start by making the interfaces of analogous non-coroutine and coroutine functions consistent with each other, then implement the non-coroutine ones using
generated_co_wrapper.For the
bdrv_pwrite_sync()case, also add the missingbdrv_co_pwrite_sync()function.
Thanks, applied to my block branch:
https://gitlab.com/hreitz/qemu/-/commits/block
Hanna