Make block-backend-io.h API more consistent
Subsystems (5)
cover Make block-backend-io.h API more consistent
Adjust existing pairs of non-coroutine and coroutine functions to share the same calling convention, and add non-coroutine/coroutine counterparts where they don't exist.
Also make the non-coroutine versions generated_co_wrappers.
This series sits on top of "[PATCH v2 00/10] Implement bdrv_{pread, pwrite, pwrite_sync, pwrite_zeroes}() using generated_co_wrapper":
https://lore.kernel.org/qemu-devel/[email protected]/
Based-on: <[email protected]>
Alberto Faria (18):
block: Make blk_{pread,pwrite}() return 0 on success
block: Add a 'flags' param to blk_pread()
block: Change blk_{pread,pwrite}() param order
block: Make 'bytes' param of blk_{pread,pwrite}() an int64_t
block: Make blk_co_pwrite() take a const buffer
block: Implement blk_{pread,pwrite}() using generated_co_wrapper
block: Add blk_{preadv,pwritev}()
block: Add blk_[co_]preadv_part()
block: Export blk_pwritev_part() in block-backend-io.h
block: Change blk_pwrite_compressed() param order
block: Add blk_co_pwrite_compressed()
block: Implement blk_pwrite_zeroes() using generated_co_wrapper
block: Implement blk_pdiscard() using generated_co_wrapper
block: Implement blk_flush() using generated_co_wrapper
block: Add blk_co_ioctl()
block: Add blk_co_truncate()
block: Reorganize some declarations in block-backend-io.h
block: Remove remaining unused symbols in coroutines.h
block.c | 10 +- block/block-backend.c | 150 ++++++++++++------------------ block/commit.c | 4 +- block/coroutines.h | 44 --------- block/crypto.c | 2 +- block/export/fuse.c | 4 +- block/meson.build | 1 + block/parallels.c | 2 +- block/qcow.c | 14 +-- block/qcow2.c | 4 +- block/qed.c | 8 +- block/vdi.c | 4 +- block/vhdx.c | 20 ++-- block/vmdk.c | 10 +- block/vpc.c | 12 +-- hw/arm/allwinner-h3.c | 2 +- hw/arm/aspeed.c | 2 +- hw/block/block.c | 2 +- hw/block/fdc.c | 20 ++-- hw/block/hd-geometry.c | 2 +- hw/block/m25p80.c | 2 +- hw/block/nand.c | 47 +++++----- hw/block/onenand.c | 32 +++---- hw/block/pflash_cfi01.c | 4 +- hw/block/pflash_cfi02.c | 4 +- hw/ide/atapi.c | 4 +- hw/misc/mac_via.c | 6 +- hw/misc/sifive_u_otp.c | 14 +-- hw/nvram/eeprom_at24c.c | 8 +- hw/nvram/spapr_nvram.c | 16 ++-- hw/nvram/xlnx-bbram.c | 4 +- hw/nvram/xlnx-efuse.c | 4 +- hw/ppc/pnv_pnor.c | 6 +- hw/sd/sd.c | 4 +- include/sysemu/block-backend-io.h | 105 ++++++++++++--------- migration/block.c | 8 +- nbd/server.c | 8 +- qemu-img.c | 33 +++---- qemu-io-cmds.c | 20 ++-- tests/unit/test-block-iothread.c | 141 ++++++++++++++++++++++++++-- 40 files changed, 433 insertions(+), 354 deletions(-)
Signature · 1 line
2.35.3
PATCH 1/18 block: Make blk_{pread,pwrite}() return 0 on success
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.
--- block.c | 8 +++++--- block/block-backend.c | 7 ++----- block/qcow.c | 6 +++--- hw/block/m25p80.c | 2 +- hw/misc/mac_via.c | 2 +- hw/misc/sifive_u_otp.c | 2 +- hw/nvram/eeprom_at24c.c | 4 ++-- hw/nvram/spapr_nvram.c | 12 ++++++------ hw/ppc/pnv_pnor.c | 2 +- qemu-img.c | 17 +++++++---------- qemu-io-cmds.c | 18 ++++++++++++------ tests/unit/test-block-iothread.c | 4 ++-- 12 files changed, 43 insertions(+), 41 deletions(-)
block.c +5 -3
@@ -1045,14 +1045,16 @@ static int find_image_format(BlockBackend *file, const char *filename,return ret; } - drv =bdrv_probe_all (buf, ret, filename); + drv =bdrv_probe_all (buf,sizeof (buf), filename);if (!drv) {error_setg (errp,"Could not determine image format: No compatible " "driver found" ); - ret = -ENOENT ; + *pdrv =NULL ; +return -ENOENT ; } + *pdrv = drv; -return ret; +return 0 ; }/**
block/block-backend.c +2 -5
@@ -1577,19 +1577,16 @@ int blk_pread(BlockBackend *blk, int64_t offset, void *buf, int bytes) ret =blk_do_preadv (blk, offset, bytes, &qiov,0 );blk_dec_in_flight (blk); -return ret <0 ? ret : bytes; +return ret; }int blk_pwrite (BlockBackend *blk,int64_t offset,const void *buf,int bytes,BdrvRequestFlags flags) { -int ret;QEMUIOVector qiov =QEMU_IOVEC_INIT_BUF (qiov, buf, bytes);IO_OR_GS_CODE (); - ret =blk_pwritev_part (blk, offset, bytes, &qiov,0 , flags); - -return ret <0 ? ret : bytes; +return blk_pwritev_part (blk, offset, bytes, &qiov,0 , flags); }int64_t blk_getlength (BlockBackend *blk)
block/qcow.c +3 -3
@@ -891,14 +891,14 @@ static int coroutine_fn qcow_co_create(BlockdevCreateOptions *opts,/* write all the data */ ret =blk_pwrite (qcow_blk,0 , &header,sizeof (header),0 ); -if (ret !=sizeof (header)) { +if (ret <0 ) { goto exit; }if (qcow_opts->has_backing_file) { ret =blk_pwrite (qcow_blk,sizeof (header), qcow_opts->backing_file, backing_filename_len,0 ); -if (ret != backing_filename_len) { +if (ret <0 ) { goto exit; } }
@@ -908,7 +908,7 @@ static int coroutine_fn qcow_co_create(BlockdevCreateOptions *opts, i++) { ret =blk_pwrite (qcow_blk, header_size +BDRV_SECTOR_SIZE * i, tmp,BDRV_SECTOR_SIZE ,0 ); -if (ret !=BDRV_SECTOR_SIZE ) { +if (ret <0 ) {g_free (tmp); goto exit; }
hw/block/m25p80.c +1 -1
@@ -1506,7 +1506,7 @@ static void m25p80_realize(SSIPeripheral *ss, Error **errp)trace_m25p80_binding (s); s->storage =blk_blockalign (s->blk, s->size); -if (blk_pread (s->blk,0 , s->storage, s->size) != s->size) { +if (blk_pread (s->blk,0 , s->storage, s->size) <0 ) {error_setg (errp,"failed to read the initial flash content" );return ; }
hw/misc/mac_via.c +1 -1
@@ -1030,7 +1030,7 @@ static void mos6522_q800_via1_realize(DeviceState *dev, Error **errp) } len =blk_pread (v1s->blk,0 , v1s->PRAM,sizeof (v1s->PRAM)); -if (len !=sizeof (v1s->PRAM)) { +if (len <0 ) {error_setg (errp,"can't read PRAM contents" );return ; }
hw/misc/sifive_u_otp.c +1 -1
@@ -240,7 +240,7 @@ static void sifive_u_otp_realize(DeviceState *dev, Error **errp)return ; } -if (blk_pread (s->blk,0 , s->fuse, filesize) != filesize) { +if (blk_pread (s->blk,0 , s->fuse, filesize) <0 ) {error_setg (errp,"failed to read the initial flash content" );return ; }
hw/nvram/eeprom_at24c.c +2 -2
@@ -65,7 +65,7 @@ int at24c_eeprom_event(I2CSlave *s, enum i2c_event event)DPRINTK ("clear\n" );if (ee->blk && ee->changed) {int len =blk_pwrite (ee->blk,0 , ee->mem, ee->rsize,0 ); -if (len != ee->rsize) { +if (len <0 ) {ERR (TYPE_AT24C_EE " : failed to write backing file\n" ); }
@@ -165,7 +165,7 @@ void at24c_eeprom_reset(DeviceState *state)if (ee->blk) {int len =blk_pread (ee->blk,0 , ee->mem, ee->rsize); -if (len != ee->rsize) { +if (len <0 ) {ERR (TYPE_AT24C_EE " : Failed initial sync with backing file\n" ); }
hw/nvram/spapr_nvram.c +6 -6
@@ -103,7 +103,7 @@ static void rtas_nvram_store(PowerPCCPU *cpu, SpaprMachineState *spapr, {SpaprNvram *nvram = spapr->nvram;hwaddr offset, buffer, len; -int alen; +int ret;void *membuf;if ((nargs !=3 ) || (nret !=2 )) {
@@ -128,9 +128,9 @@ static void rtas_nvram_store(PowerPCCPU *cpu, SpaprMachineState *spapr, membuf =cpu_physical_memory_map (buffer, &len, false); - alen = len; + ret =0 ;if (nvram->blk) { - alen =blk_pwrite (nvram->blk, offset, membuf, len,0 ); + ret =blk_pwrite (nvram->blk, offset, membuf, len,0 ); }assert (nvram->buf);
@@ -138,8 +138,8 @@ static void rtas_nvram_store(PowerPCCPU *cpu, SpaprMachineState *spapr,cpu_physical_memory_unmap (membuf, len,0 , len); -rtas_st (rets,0 , (alen < len) ?RTAS_OUT_HW_ERROR :RTAS_OUT_SUCCESS ); -rtas_st (rets,1 , (alen <0 ) ?0 : alen); +rtas_st (rets,0 , (ret <0 ) ?RTAS_OUT_HW_ERROR :RTAS_OUT_SUCCESS ); +rtas_st (rets,1 , (ret <0 ) ?0 : len); }static void spapr_nvram_realize (SpaprVioDevice *dev,Error **errp)
@@ -181,7 +181,7 @@ static void spapr_nvram_realize(SpaprVioDevice *dev, Error **errp)if (nvram->blk) {int alen =blk_pread (nvram->blk,0 , nvram->buf, nvram->size); -if (alen != nvram->size) { +if (alen <0 ) {error_setg (errp,"can't read spapr-nvram contents" );return ; }
hw/ppc/pnv_pnor.c +1 -1
@@ -99,7 +99,7 @@ static void pnv_pnor_realize(DeviceState *dev, Error **errp) s->storage =blk_blockalign (s->blk, s->size); -if (blk_pread (s->blk,0 , s->storage, s->size) != s->size) { +if (blk_pread (s->blk,0 , s->storage, s->size) <0 ) {error_setg (errp,"failed to read the initial flash content" );return ; }
qemu-img.c +7 -10
@@ -5120,30 +5120,27 @@ static int img_dd(int argc, char **argv) in.buf =g_new (uint8_t, in.bsz);for (out_pos =0 ; in_pos < size; block_count++) { -int in_ret, out_ret; +int bytes, in_ret, out_ret; -if (in_pos + in.bsz > size) { - in_ret =blk_pread (blk1, in_pos, in.buf, size - in_pos); - }else { - in_ret =blk_pread (blk1, in_pos, in.buf, in.bsz); - } + bytes = (in_pos + in.bsz > size) ? size - in_pos : in.bsz; + + in_ret =blk_pread (blk1, in_pos, in.buf, bytes);if (in_ret <0 ) {error_report ("error while reading from input image file: %s" ,strerror (-in_ret)); ret =-1 ; goto out; } - in_pos += in_ret; - - out_ret =blk_pwrite (blk2, out_pos, in.buf, in_ret,0 ); + in_pos += bytes; + out_ret =blk_pwrite (blk2, out_pos, in.buf, bytes,0 );if (out_ret <0 ) {error_report ("error while writing to output image file: %s" ,strerror (-out_ret)); ret =-1 ; goto out; } - out_pos += out_ret; + out_pos += bytes; } out:
qemu-io-cmds.c +12 -6
@@ -541,28 +541,34 @@ fail:static int do_pread (BlockBackend *blk,char *buf,int64_t offset,int64_t bytes,int64_t *total) { +int ret; +if (bytes >INT_MAX ) {return -ERANGE ; } - *total =blk_pread (blk, offset, (uint8_t *)buf, bytes); -if (*total <0 ) { -return *total; + ret =blk_pread (blk, offset, (uint8_t *)buf, bytes); +if (ret <0 ) { +return ret; } + *total = bytes;return 1 ; }static int do_pwrite (BlockBackend *blk,char *buf,int64_t offset,int64_t bytes,int flags,int64_t *total) { +int ret; +if (bytes >INT_MAX ) {return -ERANGE ; } - *total =blk_pwrite (blk, offset, (uint8_t *)buf, bytes, flags); -if (*total <0 ) { -return *total; + ret =blk_pwrite (blk, offset, (uint8_t *)buf, bytes, flags); +if (ret <0 ) { +return ret; } + *total = bytes;return 1 ; }
tests/unit/test-block-iothread.c +2 -2
@@ -117,7 +117,7 @@ static void test_sync_op_blk_pread(BlockBackend *blk)/* Success */ ret =blk_pread (blk,0 , buf,sizeof (buf)); - g_assert_cmpint(ret, ==, 512); + g_assert_cmpint(ret, ==, 0);/* Early error: Negative offset */ ret =blk_pread (blk,-2 , buf,sizeof (buf));
@@ -131,7 +131,7 @@ static void test_sync_op_blk_pwrite(BlockBackend *blk)/* Success */ ret =blk_pwrite (blk,0 , buf,sizeof (buf),0 ); - g_assert_cmpint(ret, ==, 512); + g_assert_cmpint(ret, ==, 0);/* Early error: Negative offset */ ret =blk_pwrite (blk,-2 , buf,sizeof (buf),0 );
Signature · 1 line
2.35.3
Re: [PATCH 01/18] block: Make blk_{pread,pwrite}() return 0 on success
Quoted 7 lines · On Tue, 17 May 2022 12:35:07 +0100 Alberto Faria <[email protected]> wrote:
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.Signed-off-by Alberto Faria <[email protected]>
Quoted 10 lines
--- block.c | 8 +++++--- block/block-backend.c | 7 ++----- block/qcow.c | 6 +++--- hw/block/m25p80.c | 2 +- hw/misc/mac_via.c | 2 +- hw/misc/sifive_u_otp.c | 2 +- hw/nvram/eeprom_at24c.c | 4 ++-- hw/nvram/spapr_nvram.c | 12 ++++++------ hw/ppc/pnv_pnor.c | 2 +-
For PPC and sPAPR parts
Quoted 313 lines
qemu-img.c | 17 +++++++---------- qemu-io-cmds.c | 18 ++++++++++++------ tests/unit/test-block-iothread.c | 4 ++-- 12 files changed, 43 insertions(+), 41 deletions(-)block.c +5
-3@@ -1045,14 +1045,16 @@ static int find_image_format(BlockBackend *file, const char *filename,return ret; } - drv =bdrv_probe_all (buf, ret, filename); + drv =bdrv_probe_all (buf,sizeof (buf), filename);if (!drv) {error_setg (errp,"Could not determine image format: No compatible " "driver found" ); - ret = -ENOENT ; + *pdrv =NULL ; +return -ENOENT ; } + *pdrv = drv; -return ret; +return 0 ; }/** block/block-backend.c +2
-5@@ -1577,19 +1577,16 @@ int blk_pread(BlockBackend *blk, int64_t offset, void *buf, int bytes) ret =blk_do_preadv (blk, offset, bytes, &qiov,0 );blk_dec_in_flight (blk); -return ret <0 ? ret : bytes; +return ret; }int blk_pwrite (BlockBackend *blk,int64_t offset,const void *buf,int bytes,BdrvRequestFlags flags) { -int ret;QEMUIOVector qiov =QEMU_IOVEC_INIT_BUF (qiov, buf, bytes);IO_OR_GS_CODE (); - ret =blk_pwritev_part (blk, offset, bytes, &qiov,0 , flags); - -return ret <0 ? ret : bytes; +return blk_pwritev_part (blk, offset, bytes, &qiov,0 , flags); }int64_t blk_getlength (BlockBackend *blk)block/qcow.c +3
-3@@ -891,14 +891,14 @@ static int coroutine_fn qcow_co_create(BlockdevCreateOptions *opts,/* write all the data */ ret =blk_pwrite (qcow_blk,0 , &header,sizeof (header),0 ); -if (ret !=sizeof (header)) { +if (ret <0 ) { goto exit; }if (qcow_opts->has_backing_file) { ret =blk_pwrite (qcow_blk,sizeof (header), qcow_opts->backing_file, backing_filename_len,0 ); -if (ret != backing_filename_len) { +if (ret <0 ) { goto exit; } }@@ -908,7 +908,7 @@ static int coroutine_fn qcow_co_create(BlockdevCreateOptions *opts, i++) { ret =blk_pwrite (qcow_blk, header_size +BDRV_SECTOR_SIZE * i, tmp,BDRV_SECTOR_SIZE ,0 ); -if (ret !=BDRV_SECTOR_SIZE ) { +if (ret <0 ) {g_free (tmp); goto exit; }hw/block/m25p80.c +1
-1@@ -1506,7 +1506,7 @@ static void m25p80_realize(SSIPeripheral *ss, Error **errp)trace_m25p80_binding (s); s->storage =blk_blockalign (s->blk, s->size); -if (blk_pread (s->blk,0 , s->storage, s->size) != s->size) { +if (blk_pread (s->blk,0 , s->storage, s->size) <0 ) {error_setg (errp,"failed to read the initial flash content" );return ; }hw/misc/mac_via.c +1
-1@@ -1030,7 +1030,7 @@ static void mos6522_q800_via1_realize(DeviceState *dev, Error **errp) } len =blk_pread (v1s->blk,0 , v1s->PRAM,sizeof (v1s->PRAM)); -if (len !=sizeof (v1s->PRAM)) { +if (len <0 ) {error_setg (errp,"can't read PRAM contents" );return ; }hw/misc/sifive_u_otp.c +1
-1@@ -240,7 +240,7 @@ static void sifive_u_otp_realize(DeviceState *dev, Error **errp)return ; } -if (blk_pread (s->blk,0 , s->fuse, filesize) != filesize) { +if (blk_pread (s->blk,0 , s->fuse, filesize) <0 ) {error_setg (errp,"failed to read the initial flash content" );return ; }hw/nvram/eeprom_at24c.c +2
-2@@ -65,7 +65,7 @@ int at24c_eeprom_event(I2CSlave *s, enum i2c_event event)DPRINTK ("clear\n" );if (ee->blk && ee->changed) {int len =blk_pwrite (ee->blk,0 , ee->mem, ee->rsize,0 ); -if (len != ee->rsize) { +if (len <0 ) {ERR (TYPE_AT24C_EE " : failed to write backing file\n" ); }@@ -165,7 +165,7 @@ void at24c_eeprom_reset(DeviceState *state)if (ee->blk) {int len =blk_pread (ee->blk,0 , ee->mem, ee->rsize); -if (len != ee->rsize) { +if (len <0 ) {ERR (TYPE_AT24C_EE " : Failed initial sync with backing file\n" ); }hw/nvram/spapr_nvram.c +6
-6@@ -103,7 +103,7 @@ static void rtas_nvram_store(PowerPCCPU *cpu, SpaprMachineState *spapr, {SpaprNvram *nvram = spapr->nvram;hwaddr offset, buffer, len; -int alen; +int ret;void *membuf;if ((nargs !=3 ) || (nret !=2 )) {@@ -128,9 +128,9 @@ static void rtas_nvram_store(PowerPCCPU *cpu, SpaprMachineState *spapr, membuf =cpu_physical_memory_map (buffer, &len, false); - alen = len; + ret =0 ;if (nvram->blk) { - alen =blk_pwrite (nvram->blk, offset, membuf, len,0 ); + ret =blk_pwrite (nvram->blk, offset, membuf, len,0 ); }assert (nvram->buf);@@ -138,8 +138,8 @@ static void rtas_nvram_store(PowerPCCPU *cpu, SpaprMachineState *spapr,cpu_physical_memory_unmap (membuf, len,0 , len); -rtas_st (rets,0 , (alen < len) ?RTAS_OUT_HW_ERROR :RTAS_OUT_SUCCESS ); -rtas_st (rets,1 , (alen <0 ) ?0 : alen); +rtas_st (rets,0 , (ret <0 ) ?RTAS_OUT_HW_ERROR :RTAS_OUT_SUCCESS ); +rtas_st (rets,1 , (ret <0 ) ?0 : len); }static void spapr_nvram_realize (SpaprVioDevice *dev,Error **errp)@@ -181,7 +181,7 @@ static void spapr_nvram_realize(SpaprVioDevice *dev, Error **errp)if (nvram->blk) {int alen =blk_pread (nvram->blk,0 , nvram->buf, nvram->size); -if (alen != nvram->size) { +if (alen <0 ) {error_setg (errp,"can't read spapr-nvram contents" );return ; }hw/ppc/pnv_pnor.c +1
-1@@ -99,7 +99,7 @@ static void pnv_pnor_realize(DeviceState *dev, Error **errp) s->storage =blk_blockalign (s->blk, s->size); -if (blk_pread (s->blk,0 , s->storage, s->size) != s->size) { +if (blk_pread (s->blk,0 , s->storage, s->size) <0 ) {error_setg (errp,"failed to read the initial flash content" );return ; }qemu-img.c +7
-10@@ -5120,30 +5120,27 @@ static int img_dd(int argc, char **argv) in.buf =g_new (uint8_t, in.bsz);for (out_pos =0 ; in_pos < size; block_count++) { -int in_ret, out_ret; +int bytes, in_ret, out_ret; -if (in_pos + in.bsz > size) { - in_ret =blk_pread (blk1, in_pos, in.buf, size - in_pos); - }else { - in_ret =blk_pread (blk1, in_pos, in.buf, in.bsz); - } + bytes = (in_pos + in.bsz > size) ? size - in_pos : in.bsz; + + in_ret =blk_pread (blk1, in_pos, in.buf, bytes);if (in_ret <0 ) {error_report ("error while reading from input image file: %s" ,strerror (-in_ret)); ret =-1 ; goto out; } - in_pos += in_ret; - - out_ret =blk_pwrite (blk2, out_pos, in.buf, in_ret,0 ); + in_pos += bytes; + out_ret =blk_pwrite (blk2, out_pos, in.buf, bytes,0 );if (out_ret <0 ) {error_report ("error while writing to output image file: %s" ,strerror (-out_ret)); ret =-1 ; goto out; } - out_pos += out_ret; + out_pos += bytes; } out:qemu-io-cmds.c +12
-6@@ -541,28 +541,34 @@ fail:static int do_pread (BlockBackend *blk,char *buf,int64_t offset,int64_t bytes,int64_t *total) { +int ret; +if (bytes >INT_MAX ) {return -ERANGE ; } - *total =blk_pread (blk, offset, (uint8_t *)buf, bytes); -if (*total <0 ) { -return *total; + ret =blk_pread (blk, offset, (uint8_t *)buf, bytes); +if (ret <0 ) { +return ret; } + *total = bytes;return 1 ; }static int do_pwrite (BlockBackend *blk,char *buf,int64_t offset,int64_t bytes,int flags,int64_t *total) { +int ret; +if (bytes >INT_MAX ) {return -ERANGE ; } - *total =blk_pwrite (blk, offset, (uint8_t *)buf, bytes, flags); -if (*total <0 ) { -return *total; + ret =blk_pwrite (blk, offset, (uint8_t *)buf, bytes, flags); +if (ret <0 ) { +return ret; } + *total = bytes;return 1 ; }tests/unit/test-block-iothread.c +2
-2@@ -117,7 +117,7 @@ static void test_sync_op_blk_pread(BlockBackend *blk)/* Success */ ret =blk_pread (blk,0 , buf,sizeof (buf)); - g_assert_cmpint(ret, ==, 512); + g_assert_cmpint(ret, ==, 0);/* Early error: Negative offset */ ret =blk_pread (blk,-2 , buf,sizeof (buf));@@ -131,7 +131,7 @@ static void test_sync_op_blk_pwrite(BlockBackend *blk)/* Success */ ret =blk_pwrite (blk,0 , buf,sizeof (buf),0 ); - g_assert_cmpint(ret, ==, 512); + g_assert_cmpint(ret, ==, 0);/* Early error: Negative offset */ ret =blk_pwrite (blk,-2 , buf,sizeof (buf),0 );
Re: [PATCH 01/18] block: Make blk_{pread,pwrite}() return 0 on success
In reply to Alberto FariaQuoted 11 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.Signed-off-by Alberto Faria <[email protected]>---
+++
b/qemu-img.c
qemu-img.c static int img_dd(int argc, char **argv) · line 5122
Quoted 3 lines
qemu-img.c +0
-0@@ -5120,30 +5120,27 @@ static int img_dd(int argc, char **argv) in.buf =g_new (uint8_t, in.bsz);for (out_pos =0 ; in_pos < size; block_count++) {
in_pos, out_pos, and size are int64_t...
qemu-img.c static int img_dd(int argc, char **argv) · line 5125
Quoted 9 lines
qemu-img.c +2
-6-int in_ret, out_ret; +int bytes, in_ret, out_ret; -if (in_pos + in.bsz > size) { - in_ret =blk_pread (blk1, in_pos, in.buf, size - in_pos); - }else { - in_ret =blk_pread (blk1, in_pos, in.buf, in.bsz); - } + bytes = (in_pos + in.bsz > size) ? size - in_pos : in.bsz;
...but in.bsz is int, so declaring 'int bytes' appears safe.
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org
Re: [PATCH 01/18] block: Make blk_{pread,pwrite}() return 0 on success
In reply to Alberto FariaQuoted 7 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.Signed-off-by Alberto Faria <[email protected]>
Quoted 14 lines
--- block.c | 8 +++++--- block/block-backend.c | 7 ++----- block/qcow.c | 6 +++--- hw/block/m25p80.c | 2 +- hw/misc/mac_via.c | 2 +- hw/misc/sifive_u_otp.c | 2 +- hw/nvram/eeprom_at24c.c | 4 ++-- hw/nvram/spapr_nvram.c | 12 ++++++------ hw/ppc/pnv_pnor.c | 2 +- qemu-img.c | 17 +++++++---------- qemu-io-cmds.c | 18 ++++++++++++------ tests/unit/test-block-iothread.c | 4 ++-- 12 files changed, 43 insertions(+), 41 deletions(-)
Overall, looks good to me, so first of all:
There are a couple of places where you decided to replace “*len” variables that used to store the return value by a plain “ret”. That seems good to me, given how these functions no longer return length values, but you haven’t done so consistently. Below, I have noted places where this wasn’t done; I wonder why, but my R-b stands regardless of whether you change them too or not.
[...]
hw/misc/mac_via.c static void mos6522_q800_via1_realize(DeviceState *dev, Error **errp) · line 1033
Quoted 10 lines
hw/misc/mac_via.c +1
-1@@ -1030,7 +1030,7 @@ static void mos6522_q800_via1_realize(DeviceState *dev, Error **errp) } len =blk_pread (v1s->blk,0 , v1s->PRAM,sizeof (v1s->PRAM)); -if (len !=sizeof (v1s->PRAM)) { +if (len <0 ) {
We could use ret here instead.
Quoted 3 lines
hw/misc/mac_via.c +0
-0error_setg (errp,"can't read PRAM contents" );return ; }
[...]
Quoted 14 lines
hw/nvram/eeprom_at24c.c +1
-1@@ -65,7 +65,7 @@ int at24c_eeprom_event(I2CSlave *s, enum i2c_event event)DPRINTK ("clear\n" );if (ee->blk && ee->changed) {int len =blk_pwrite (ee->blk,0 , ee->mem, ee->rsize,0 ); -if (len != ee->rsize) { +if (len <0 ) {ERR (TYPE_AT24C_EE " : failed to write backing file\n" ); }
hw/nvram/eeprom_at24c.c void at24c_eeprom_reset(DeviceState *state) · line 168
Quoted 5 lines
hw/nvram/eeprom_at24c.c +1
-1@@ -165,7 +165,7 @@ void at24c_eeprom_reset(DeviceState *state)if (ee->blk) {int len =blk_pread (ee->blk,0 , ee->mem, ee->rsize); -if (len != ee->rsize) { +if (len <0 ) {
We could rename len to ret in both of these hunks.
Quoted 7 lines
hw/nvram/eeprom_at24c.c +0
-0ERR (TYPE_AT24C_EE " : Failed initial sync with backing file\n" ); }hw/nvram/spapr_nvram.c +0
-0
[...]
hw/nvram/spapr_nvram.c static void spapr_nvram_realize(SpaprVioDevice *dev, Error **errp) · line 184
Quoted 6 lines
hw/nvram/spapr_nvram.c +1
-1@@ -181,7 +181,7 @@ static void spapr_nvram_realize(SpaprVioDevice *dev, Error **errp)if (nvram->blk) {int alen =blk_pread (nvram->blk,0 , nvram->buf, nvram->size); -if (alen != nvram->size) { +if (alen <0 ) {
As above (and the other case in this file), might be nice to drop alen here and just use ret instead.
Quoted 3 lines
hw/nvram/spapr_nvram.c +0
-0error_setg (errp,"can't read spapr-nvram contents" );return ; }
[...]
Quoted 32 lines
qemu-img.c +6
-9@@ -5120,30 +5120,27 @@ static int img_dd(int argc, char **argv) in.buf =g_new (uint8_t, in.bsz);for (out_pos =0 ; in_pos < size; block_count++) { -int in_ret, out_ret; +int bytes, in_ret, out_ret; -if (in_pos + in.bsz > size) { - in_ret =blk_pread (blk1, in_pos, in.buf, size - in_pos); - }else { - in_ret =blk_pread (blk1, in_pos, in.buf, in.bsz); - } + bytes = (in_pos + in.bsz > size) ? size - in_pos : in.bsz; + + in_ret =blk_pread (blk1, in_pos, in.buf, bytes);if (in_ret <0 ) {error_report ("error while reading from input image file: %s" ,strerror (-in_ret)); ret =-1 ; goto out; } - in_pos += in_ret; - - out_ret =blk_pwrite (blk2, out_pos, in.buf, in_ret,0 ); + in_pos += bytes; + out_ret =blk_pwrite (blk2, out_pos, in.buf, bytes,0 );if (out_ret <0 ) {
qemu-img.c static int img_dd(int argc, char **argv) · line 5146
Quoted 10 lines
qemu-img.c +1
-1error_report ("error while writing to output image file: %s" ,strerror (-out_ret)); ret =-1 ; goto out; } - out_pos += out_ret; + out_pos += bytes; } out:
We could use this opportunity to drop in_ret and out_ret altogether (but we can also decide not to).
Hanna
Re: [PATCH 01/18] block: Make blk_{pread, pwrite}() return 0 on success
Quoted 6 lines · Hanna Reitz
There are a couple of places where you decided to replace “*len” variables that used to store the return value by a plain “ret”. That seems good to me, given how these functions no longer return length values, but you haven’t done so consistently. Below, I have noted places where this wasn’t done; I wonder why, but my R-b stands regardless of whether you change them too or not.
Thanks, this was just an oversight on my part. I'll fix it.
Quoted 41 lines
Quoted 41 lines
qemu-img.c +7
-10@@ -5120,30 +5120,27 @@ static int img_dd(int argc, char **argv) in.buf =g_new (uint8_t, in.bsz);for (out_pos =0 ; in_pos < size; block_count++) { -int in_ret, out_ret; +int bytes, in_ret, out_ret; -if (in_pos + in.bsz > size) { - in_ret =blk_pread (blk1, in_pos, in.buf, size - in_pos); - }else { - in_ret =blk_pread (blk1, in_pos, in.buf, in.bsz); - } + bytes = (in_pos + in.bsz > size) ? size - in_pos : in.bsz; + + in_ret =blk_pread (blk1, in_pos, in.buf, bytes);if (in_ret <0 ) {error_report ("error while reading from input image file: %s" ,strerror (-in_ret)); ret =-1 ; goto out; } - in_pos += in_ret; - - out_ret =blk_pwrite (blk2, out_pos, in.buf, in_ret,0 ); + in_pos += bytes; + out_ret =blk_pwrite (blk2, out_pos, in.buf, bytes,0 );if (out_ret <0 ) {error_report ("error while writing to output image file: %s" ,strerror (-out_ret)); ret =-1 ; goto out; } - out_pos += out_ret; + out_pos += bytes; }
Quoted 4 lines
qemu-img.c static int img_dd(int argc, char **argv) · line 5146
Quoted 1 line
qemu-img.c +0
-0out:We could use this opportunity to drop
in_retandout_retaltogether (but we can also decide not to).
Dropping them sounds good to me.
Alberto
PATCH 2/18 block: Add a 'flags' param to blk_pread()
In reply to Alberto FariaFor consistency with other I/O functions, and in preparation to implement it using generated_co_wrapper.
Callers were updated using this Coccinelle script:
@@ expression blk, offset, buf, bytes; @@
- blk_pread(blk, offset, buf, bytes)
+ blk_pread(blk, offset, buf, bytes, 0)
It had no effect on hw/block/nand.c, presumably due to the #if, so that file was updated manually.
Overly-long lines were then fixed by hand.
--- block.c | 2 +- block/block-backend.c | 5 +++-- block/commit.c | 2 +- block/export/fuse.c | 2 +- hw/arm/allwinner-h3.c | 2 +- hw/arm/aspeed.c | 2 +- hw/block/block.c | 2 +- hw/block/fdc.c | 6 +++--- hw/block/hd-geometry.c | 2 +- hw/block/m25p80.c | 2 +- hw/block/nand.c | 12 ++++++------ hw/block/onenand.c | 12 ++++++------ hw/ide/atapi.c | 4 ++-- hw/misc/mac_via.c | 2 +- hw/misc/sifive_u_otp.c | 4 ++-- hw/nvram/eeprom_at24c.c | 2 +- hw/nvram/spapr_nvram.c | 2 +- hw/nvram/xlnx-bbram.c | 2 +- hw/nvram/xlnx-efuse.c | 2 +- hw/ppc/pnv_pnor.c | 2 +- hw/sd/sd.c | 2 +- include/sysemu/block-backend-io.h | 3 ++- migration/block.c | 4 ++-- nbd/server.c | 4 ++-- qemu-img.c | 12 ++++++------ qemu-io-cmds.c | 2 +- tests/unit/test-block-iothread.c | 4 ++-- 27 files changed, 52 insertions(+), 50 deletions(-)
block.c +1 -1
@@ -1037,7 +1037,7 @@ static int find_image_format(BlockBackend *file, const char *filename,return ret; } - ret =blk_pread (file,0 , buf,sizeof (buf)); + ret =blk_pread (file,0 , buf,sizeof (buf),0 );if (ret <0 ) {error_setg_errno (errp, -ret,"Could not read image for determining its " "format" );
block/block-backend.c +3 -2
@@ -1567,14 +1567,15 @@ BlockAIOCB *blk_aio_pwrite_zeroes(BlockBackend *blk, int64_t offset, flags | BDRV_REQ_ZERO_WRITE, cb, opaque); } -int blk_pread (BlockBackend *blk,int64_t offset,void *buf,int bytes) +int blk_pread (BlockBackend *blk,int64_t offset,void *buf,int bytes, +BdrvRequestFlags flags) {int ret;QEMUIOVector qiov =QEMU_IOVEC_INIT_BUF (qiov, buf, bytes);IO_OR_GS_CODE ();blk_inc_in_flight (blk); - ret =blk_do_preadv (blk, offset, bytes, &qiov,0 ); + ret =blk_do_preadv (blk, offset, bytes, &qiov, flags);blk_dec_in_flight (blk);return ret;
block/commit.c +1 -1
@@ -527,7 +527,7 @@ int bdrv_commit(BlockDriverState *bs) goto ro_cleanup; }if (ret) { - ret =blk_pread (src, offset, buf, n); + ret =blk_pread (src, offset, buf, n,0 );if (ret <0 ) { goto ro_cleanup; }
block/export/fuse.c +1 -1
@@ -554,7 +554,7 @@ static void fuse_read(fuse_req_t req, fuse_ino_t inode,return ; } - ret =blk_pread (exp->common.blk, offset, buf, size); + ret =blk_pread (exp->common.blk, offset, buf, size,0 );if (ret >=0 ) {fuse_reply_buf (req, buf, size); }else {
hw/arm/allwinner-h3.c +1 -1
@@ -174,7 +174,7 @@ void allwinner_h3_bootrom_setup(AwH3State *s, BlockBackend *blk)const int64_t rom_size =32 * KiB; g_autofree uint8_t *buffer = g_new0(uint8_t, rom_size); -if (blk_pread (blk,8 * KiB, buffer, rom_size) <0 ) { +if (blk_pread (blk,8 * KiB, buffer, rom_size,0 ) <0 ) {error_setg (&error_fatal,"%s: failed to read BlockBackend data" , __func__);return ;
hw/arm/aspeed.c +1 -1
@@ -269,7 +269,7 @@ static void write_boot_rom(DriveInfo *dinfo, hwaddr addr, size_t rom_size, } storage =g_malloc0 (rom_size); -if (blk_pread (blk,0 , storage, rom_size) <0 ) { +if (blk_pread (blk,0 , storage, rom_size,0 ) <0 ) {error_setg (errp,"failed to read the initial flash content" );return ; }
hw/block/block.c +1 -1
@@ -53,7 +53,7 @@ bool blk_check_size_and_read_all(BlockBackend *blk, void *buf, hwaddr size,* block device and read only on demand. */ assert (size <=BDRV_REQUEST_MAX_BYTES ); - ret =blk_pread (blk,0 , buf, size); + ret =blk_pread (blk,0 , buf, size,0 );if (ret <0 ) {error_setg_errno (errp, -ret,"can't read block backend" );return false;
hw/block/fdc.c +3 -3
@@ -1628,8 +1628,8 @@ int fdctrl_transfer_handler(void *opaque, int nchan, int dma_pos, int dma_len)if (fdctrl->data_dir !=FD_DIR_WRITE || len <FD_SECTOR_LEN || rel_pos !=0 ) {/* READ & SCAN commands and realign to a sector for WRITE */ -if (blk_pread (cur_drv->blk,fd_offset (cur_drv), - fdctrl->fifo,BDRV_SECTOR_SIZE ) <0 ) { +if (blk_pread (cur_drv->blk,fd_offset (cur_drv), fdctrl->fifo, +BDRV_SECTOR_SIZE ,0 ) <0 ) {FLOPPY_DPRINTF ("Floppy: error getting sector %d\n" ,fd_sector (cur_drv));/* Sure, image size is too small... */
@@ -1741,7 +1741,7 @@ static uint32_t fdctrl_read_data(FDCtrl *fdctrl)return 0 ; }if (blk_pread (cur_drv->blk,fd_offset (cur_drv), fdctrl->fifo, -BDRV_SECTOR_SIZE ) +BDRV_SECTOR_SIZE ,0 ) <0 ) {FLOPPY_DPRINTF ("error getting sector %d\n" ,fd_sector (cur_drv));
hw/block/hd-geometry.c +1 -1
@@ -63,7 +63,7 @@ static int guess_disk_lchs(BlockBackend *blk,blk_get_geometry (blk, &nb_sectors); -if (blk_pread (blk,0 , buf,BDRV_SECTOR_SIZE ) <0 ) { +if (blk_pread (blk,0 , buf,BDRV_SECTOR_SIZE ,0 ) <0 ) {return -1 ; }/* test msdos magic */
hw/block/m25p80.c +1 -1
@@ -1506,7 +1506,7 @@ static void m25p80_realize(SSIPeripheral *ss, Error **errp)trace_m25p80_binding (s); s->storage =blk_blockalign (s->blk, s->size); -if (blk_pread (s->blk,0 , s->storage, s->size) <0 ) { +if (blk_pread (s->blk,0 , s->storage, s->size,0 ) <0 ) {error_setg (errp,"failed to read the initial flash content" );return ; }
hw/block/nand.c +6 -6
@@ -667,7 +667,7 @@ static void glue(nand_blk_write_, NAND_PAGE_SIZE)(NANDFlashState *s) off = (s->addr &PAGE_MASK ) + s->offset; soff =SECTOR_OFFSET (s->addr);if (blk_pread (s->blk, sector <<BDRV_SECTOR_BITS , iobuf, -PAGE_SECTORS <<BDRV_SECTOR_BITS ) <0 ) { +PAGE_SECTORS <<BDRV_SECTOR_BITS ,0 ) <0 ) {printf ("%s: read error in sector %" PRIu64"\n" , __func__, sector);return ; }
@@ -688,7 +688,7 @@ static void glue(nand_blk_write_, NAND_PAGE_SIZE)(NANDFlashState *s) sector = off >>9 ; soff = off &0x1ff ;if (blk_pread (s->blk, sector <<BDRV_SECTOR_BITS , iobuf, - (PAGE_SECTORS +2 ) <<BDRV_SECTOR_BITS ) <0 ) { + (PAGE_SECTORS +2 ) <<BDRV_SECTOR_BITS ,0 ) <0 ) {printf ("%s: read error in sector %" PRIu64"\n" , __func__, sector);return ; }
@@ -731,7 +731,7 @@ static void glue(nand_blk_erase_, NAND_PAGE_SIZE)(NANDFlashState *s) addr =PAGE_START (addr); page = addr >>9 ;if (blk_pread (s->blk, page <<BDRV_SECTOR_BITS , iobuf, -BDRV_SECTOR_SIZE ) <0 ) { +BDRV_SECTOR_SIZE ,0 ) <0 ) {printf ("%s: read error in sector %" PRIu64"\n" , __func__, page); }memset (iobuf + (addr &0x1ff ),0xff , (~addr &0x1ff ) +1 );
@@ -752,7 +752,7 @@ static void glue(nand_blk_erase_, NAND_PAGE_SIZE)(NANDFlashState *s) page = i >>9 ;if (blk_pread (s->blk, page <<BDRV_SECTOR_BITS , iobuf, -BDRV_SECTOR_SIZE ) <0 ) { +BDRV_SECTOR_SIZE ,0 ) <0 ) {printf ("%s: read error in sector %" PRIu64"\n" , __func__, page); }memset (iobuf,0xff , ((addr -1 ) &0x1ff ) +1 );
@@ -773,7 +773,7 @@ static void glue(nand_blk_load_, NAND_PAGE_SIZE)(NANDFlashState *s,if (s->blk) {if (s->mem_oob) {if (blk_pread (s->blk,SECTOR (addr) <<BDRV_SECTOR_BITS , s->io, -PAGE_SECTORS <<BDRV_SECTOR_BITS ) <0 ) { +PAGE_SECTORS <<BDRV_SECTOR_BITS ,0 ) <0 ) {printf ("%s: read error in sector %" PRIu64"\n" , __func__,SECTOR (addr)); }
@@ -783,7 +783,7 @@ static void glue(nand_blk_load_, NAND_PAGE_SIZE)(NANDFlashState *s, s->ioaddr = s->io +SECTOR_OFFSET (s->addr) + offset; }else {if (blk_pread (s->blk,PAGE_START (addr), s->io, - (PAGE_SECTORS +2 ) <<BDRV_SECTOR_BITS ) <0 ) { + (PAGE_SECTORS +2 ) <<BDRV_SECTOR_BITS ,0 ) <0 ) {printf ("%s: read error in sector %" PRIu64"\n" , __func__,PAGE_START (addr) >>9 ); }
hw/block/onenand.c +6 -6
@@ -230,7 +230,7 @@ static void onenand_reset(OneNANDState *s, int cold)memset (s->blockwp,ONEN_LOCK_LOCKED , s->blocks);if (s->blk_cur &&blk_pread (s->blk_cur,0 , s->boot[0 ], -8 <<BDRV_SECTOR_BITS ) <0 ) { +8 <<BDRV_SECTOR_BITS ,0 ) <0 ) {hw_error ("%s: Loading the BootRAM failed.\n" , __func__); } }
@@ -250,7 +250,7 @@ static inline int onenand_load_main(OneNANDState *s, int sec, int secn,assert (UINT32_MAX >>BDRV_SECTOR_BITS > secn);if (s->blk_cur) {return blk_pread (s->blk_cur, sec <<BDRV_SECTOR_BITS , dest, - secn <<BDRV_SECTOR_BITS ) <0 ; + secn <<BDRV_SECTOR_BITS ,0 ) <0 ; }else if (sec + secn > s->secs_cur) {return 1 ; }
@@ -274,7 +274,7 @@ static inline int onenand_prog_main(OneNANDState *s, int sec, int secn,uint8_t *dp =0 ;if (s->blk_cur) { dp =g_malloc (size); -if (!dp ||blk_pread (s->blk_cur, offset, dp, size) <0 ) { +if (!dp ||blk_pread (s->blk_cur, offset, dp, size,0 ) <0 ) { result =1 ; } }else {
@@ -308,7 +308,7 @@ static inline int onenand_load_spare(OneNANDState *s, int sec, int secn,if (s->blk_cur) {uint32_t offset = (s->secs_cur + (sec >>5 )) <<BDRV_SECTOR_BITS ; -if (blk_pread (s->blk_cur, offset, buf,BDRV_SECTOR_SIZE ) <0 ) { +if (blk_pread (s->blk_cur, offset, buf,BDRV_SECTOR_SIZE ,0 ) <0 ) {return 1 ; }memcpy (dest, buf + ((sec &31 ) <<4 ), secn <<4 );
@@ -333,7 +333,7 @@ static inline int onenand_prog_spare(OneNANDState *s, int sec, int secn,if (s->blk_cur) { dp =g_malloc (512 );if (!dp - ||blk_pread (s->blk_cur, offset, dp,BDRV_SECTOR_SIZE ) <0 ) { + ||blk_pread (s->blk_cur, offset, dp,BDRV_SECTOR_SIZE ,0 ) <0 ) { result =1 ; }else { dpp = dp + ((sec &31 ) <<4 );
@@ -375,7 +375,7 @@ static inline int onenand_erase(OneNANDState *s, int sec, int num) goto fail; }if (blk_pread (s->blk_cur, erasesec <<BDRV_SECTOR_BITS , tmpbuf, -BDRV_SECTOR_SIZE ) <0 ) { +BDRV_SECTOR_SIZE ,0 ) <0 ) { goto fail; }memcpy (tmpbuf + ((sec &31 ) <<4 ), blankbuf,1 <<4 );
hw/ide/atapi.c +2 -2
@@ -98,11 +98,11 @@ cd_read_sector_sync(IDEState *s)switch (s->cd_sector_size) {case 2048 : ret =blk_pread (s->blk, (int64_t )s->lba <<ATAPI_SECTOR_BITS , - s->io_buffer,ATAPI_SECTOR_SIZE ); + s->io_buffer,ATAPI_SECTOR_SIZE ,0 );break ;case 2352 : ret =blk_pread (s->blk, (int64_t )s->lba <<ATAPI_SECTOR_BITS , - s->io_buffer +16 ,ATAPI_SECTOR_SIZE ); + s->io_buffer +16 ,ATAPI_SECTOR_SIZE ,0 );if (ret >=0 ) {cd_data_to_raw (s->io_buffer, s->lba); }
hw/misc/mac_via.c +1 -1
@@ -1029,7 +1029,7 @@ static void mos6522_q800_via1_realize(DeviceState *dev, Error **errp)return ; } - len =blk_pread (v1s->blk,0 , v1s->PRAM,sizeof (v1s->PRAM)); + len =blk_pread (v1s->blk,0 , v1s->PRAM,sizeof (v1s->PRAM),0 );if (len <0 ) {error_setg (errp,"can't read PRAM contents" );return ;
hw/misc/sifive_u_otp.c +2 -2
@@ -65,7 +65,7 @@ static uint64_t sifive_u_otp_read(void *opaque, hwaddr addr, unsigned int size)int32_t buf;if (blk_pread (s->blk, s->pa *SIFIVE_U_OTP_FUSE_WORD , &buf, -SIFIVE_U_OTP_FUSE_WORD ) <0 ) { +SIFIVE_U_OTP_FUSE_WORD ,0 ) <0 ) {error_report ("read error index<%d>" , s->pa);return 0xff ; }
@@ -240,7 +240,7 @@ static void sifive_u_otp_realize(DeviceState *dev, Error **errp)return ; } -if (blk_pread (s->blk,0 , s->fuse, filesize) <0 ) { +if (blk_pread (s->blk,0 , s->fuse, filesize,0 ) <0 ) {error_setg (errp,"failed to read the initial flash content" );return ; }
hw/nvram/eeprom_at24c.c +1 -1
@@ -163,7 +163,7 @@ void at24c_eeprom_reset(DeviceState *state)memset (ee->mem,0 , ee->rsize);if (ee->blk) { -int len =blk_pread (ee->blk,0 , ee->mem, ee->rsize); +int len =blk_pread (ee->blk,0 , ee->mem, ee->rsize,0 );if (len <0 ) { ERR(TYPE_AT24C_EE
hw/nvram/spapr_nvram.c +1 -1
@@ -179,7 +179,7 @@ static void spapr_nvram_realize(SpaprVioDevice *dev, Error **errp) }if (nvram->blk) { -int alen =blk_pread (nvram->blk,0 , nvram->buf, nvram->size); +int alen =blk_pread (nvram->blk,0 , nvram->buf, nvram->size,0 );if (alen <0 ) {error_setg (errp,"can't read spapr-nvram contents" );
hw/nvram/xlnx-bbram.c +1 -1
@@ -124,7 +124,7 @@ static void bbram_bdrv_read(XlnxBBRam *s, Error **errp) blk_name(s->blk)); } -if (blk_pread (s->blk,0 , ram, nr) <0 ) { +if (blk_pread (s->blk,0 , ram, nr,0 ) <0 ) {error_setg (errp,"%s: Failed to read %u bytes from BBRAM backstore." ,blk_name (s->blk), nr);
hw/nvram/xlnx-efuse.c +1 -1
@@ -77,7 +77,7 @@ static int efuse_bdrv_read(XlnxEFuse *s, Error **errp) blk_name(s->blk)); } -if (blk_pread (s->blk,0 , ram, nr) <0 ) { +if (blk_pread (s->blk,0 , ram, nr,0 ) <0 ) {error_setg (errp,"%s: Failed to read %u bytes from eFUSE backstore." ,blk_name (s->blk), nr);return -1 ;
hw/ppc/pnv_pnor.c +1 -1
@@ -99,7 +99,7 @@ static void pnv_pnor_realize(DeviceState *dev, Error **errp) s->storage =blk_blockalign (s->blk, s->size); -if (blk_pread (s->blk,0 , s->storage, s->size) <0 ) { +if (blk_pread (s->blk,0 , s->storage, s->size,0 ) <0 ) {error_setg (errp,"failed to read the initial flash content" );return ; }
hw/sd/sd.c +1 -1
@@ -752,7 +752,7 @@ void sd_set_cb(SDState *sd, qemu_irq readonly, qemu_irq insert)static void sd_blk_read (SDState *sd,uint64_t addr,uint32_t len) {trace_sdcard_read_block (addr, len); -if (!sd->blk ||blk_pread (sd->blk, addr, sd->data, len) <0 ) { +if (!sd->blk ||blk_pread (sd->blk, addr, sd->data, len,0 ) <0 ) {fprintf (stderr,"sd_blk_read: read error on host side\n" ); } }
include/sysemu/block-backend-io.h +2 -1
@@ -102,7 +102,8 @@ int coroutine_fn blk_co_copy_range(BlockBackend *blk_in, int64_t off_in,* the "I/O or GS" API. */ -int blk_pread (BlockBackend *blk,int64_t offset,void *buf,int bytes); +int blk_pread (BlockBackend *blk,int64_t offset,void *buf,int bytes, +BdrvRequestFlags flags);int blk_pwrite (BlockBackend *blk,int64_t offset,const void *buf,int bytes,BdrvRequestFlags flags); int coroutine_fn blk_co_preadv(BlockBackend *blk, int64_t offset,
migration/block.c +2 -2
@@ -568,8 +568,8 @@ static int mig_save_device_dirty(QEMUFile *f, BlkMigDevState *bmds,bmds_set_aio_inflight (bmds, sector, nr_sectors,1 );blk_mig_unlock (); }else { - ret =blk_pread (bmds->blk, sector *BDRV_SECTOR_SIZE , blk->buf, - nr_sectors *BDRV_SECTOR_SIZE ); + ret =blk_pread (bmds->blk, sector *BDRV_SECTOR_SIZE , + blk->buf, nr_sectors *BDRV_SECTOR_SIZE ,0 );if (ret <0 ) { goto error; }
nbd/server.c +2 -2
@@ -2040,7 +2040,7 @@ static int coroutine_fn nbd_co_send_sparse_read(NBDClient *client, ret =nbd_co_send_iov (client, iov,1 , errp); }else { ret =blk_pread (exp->common.blk, offset + progress, - data + progress, pnum); + data + progress, pnum,0 );if (ret <0 ) {error_setg_errno (errp, -ret,"reading from file failed" );break ;
@@ -2444,7 +2444,7 @@ static coroutine_fn int nbd_do_cmd_read(NBDClient *client, NBDRequest *request, data, request->len, errp); } - ret =blk_pread (exp->common.blk, request->from, data, request->len); + ret =blk_pread (exp->common.blk, request->from, data, request->len,0 );if (ret <0 ) {return nbd_send_generic_reply (client, request->handle, ret,"reading from file failed" , errp);
qemu-img.c +6 -6
@@ -1309,7 +1309,7 @@ static int check_empty_sectors(BlockBackend *blk, int64_t offset,int ret =0 ;int64_t idx; - ret =blk_pread (blk, offset, buffer, bytes); + ret =blk_pread (blk, offset, buffer, bytes,0 );if (ret <0 ) {error_report ("Error while reading offset %" PRId64" of %s: %s" , offset, filename,strerror (-ret));
@@ -1526,7 +1526,7 @@ static int img_compare(int argc, char **argv)int64_t pnum; chunk =MIN (chunk,IO_BUF_SIZE ); - ret =blk_pread (blk1, offset, buf1, chunk); + ret =blk_pread (blk1, offset, buf1, chunk,0 );if (ret <0 ) { error_report("Error while reading offset %" PRId64 " of %s: %s",
@@ -1534,7 +1534,7 @@ static int img_compare(int argc, char **argv) ret =4 ; goto out; } - ret =blk_pread (blk2, offset, buf2, chunk); + ret =blk_pread (blk2, offset, buf2, chunk,0 );if (ret <0 ) { error_report("Error while reading offset %" PRId64 " of %s: %s",
@@ -3779,7 +3779,7 @@ static int img_rebase(int argc, char **argv) n = old_backing_size - offset; } - ret =blk_pread (blk_old_backing, offset, buf_old, n); + ret =blk_pread (blk_old_backing, offset, buf_old, n,0 );if (ret <0 ) {error_report ("error while reading from old backing file" ); goto out;
@@ -3793,7 +3793,7 @@ static int img_rebase(int argc, char **argv) n = new_backing_size - offset; } - ret =blk_pread (blk_new_backing, offset, buf_new, n); + ret =blk_pread (blk_new_backing, offset, buf_new, n,0 );if (ret <0 ) {error_report ("error while reading from new backing file" ); goto out;
@@ -5124,7 +5124,7 @@ static int img_dd(int argc, char **argv) bytes = (in_pos + in.bsz > size) ? size - in_pos : in.bsz; - in_ret =blk_pread (blk1, in_pos, in.buf, bytes); + in_ret =blk_pread (blk1, in_pos, in.buf, bytes,0 );if (in_ret <0 ) {error_report ("error while reading from input image file: %s" ,strerror (-in_ret));
qemu-io-cmds.c +1 -1
@@ -547,7 +547,7 @@ static int do_pread(BlockBackend *blk, char *buf, int64_t offset,return -ERANGE ; } - ret =blk_pread (blk, offset, (uint8_t *)buf, bytes); + ret =blk_pread (blk, offset, (uint8_t *)buf, bytes,0 );if (ret <0 ) {return ret; }
tests/unit/test-block-iothread.c +2 -2
@@ -116,11 +116,11 @@ static void test_sync_op_blk_pread(BlockBackend *blk)int ret;/* Success */ - ret =blk_pread (blk,0 , buf,sizeof (buf)); + ret =blk_pread (blk,0 , buf,sizeof (buf),0 ); g_assert_cmpint(ret, ==, 0);/* Early error: Negative offset */ - ret =blk_pread (blk,-2 , buf,sizeof (buf)); + ret =blk_pread (blk,-2 , buf,sizeof (buf),0 ); g_assert_cmpint(ret, ==, -EIO); }
Signature · 1 line
2.35.3
Re: [PATCH 02/18] block: Add a 'flags' param to blk_pread()
Quoted 11 lines · Alberto Faria
For consistency with other I/O functions, and in preparation to implement it using
generated_co_wrapper.Callers were updated using this Coccinelle script:
@@ expression blk, offset, buf, bytes; @@
-blk_pread(blk, offset, buf, bytes)
+blk_pread(blk, offset, buf, bytes, 0)It had no effect on
hw/block/nand.c, presumably due to the #if, so that file was updated manually.
Whoa that's disgusting...
Quoted 3 lines
Overly-long lines were then fixed by hand.
Signed-off-by Alberto Faria <[email protected]>
Paolo
Re: [PATCH 02/18] block: Add a 'flags' param to blk_pread()
In reply to Alberto FariaQuoted 9 lines · On Tue, 17 May 2022 12:35:08 +0100 Alberto Faria <[email protected]> wrote:
For consistency with other I/O functions, and in preparation to implement it using
generated_co_wrapper.Callers were updated using this Coccinelle script:
@@ expression blk, offset, buf, bytes; @@
-blk_pread(blk, offset, buf, bytes)
+blk_pread(blk, offset, buf, bytes, 0)
Quoted 7 lines
It had no effect on
hw/block/nand.c, presumably due to the #if, so that file was updated manually.Overly-long lines were then fixed by hand.
Signed-off-by Alberto Faria <[email protected]>---
Quoted 566 lines
block.c | 2 +- block/block-backend.c | 5 +++-- block/commit.c | 2 +- block/export/fuse.c | 2 +- hw/arm/allwinner-h3.c | 2 +- hw/arm/aspeed.c | 2 +- hw/block/block.c | 2 +- hw/block/fdc.c | 6 +++--- hw/block/hd-geometry.c | 2 +- hw/block/m25p80.c | 2 +- hw/block/nand.c | 12 ++++++------ hw/block/onenand.c | 12 ++++++------ hw/ide/atapi.c | 4 ++-- hw/misc/mac_via.c | 2 +- hw/misc/sifive_u_otp.c | 4 ++-- hw/nvram/eeprom_at24c.c | 2 +- hw/nvram/spapr_nvram.c | 2 +- hw/nvram/xlnx-bbram.c | 2 +- hw/nvram/xlnx-efuse.c | 2 +- hw/ppc/pnv_pnor.c | 2 +- hw/sd/sd.c | 2 +- include/sysemu/block-backend-io.h | 3 ++- migration/block.c | 4 ++-- nbd/server.c | 4 ++-- qemu-img.c | 12 ++++++------ qemu-io-cmds.c | 2 +- tests/unit/test-block-iothread.c | 4 ++-- 27 files changed, 52 insertions(+), 50 deletions(-)block.c +1
-1@@ -1037,7 +1037,7 @@ static int find_image_format(BlockBackend *file, const char *filename,return ret; } - ret =blk_pread (file,0 , buf,sizeof (buf)); + ret =blk_pread (file,0 , buf,sizeof (buf),0 );if (ret <0 ) {error_setg_errno (errp, -ret,"Could not read image for determining its " "format" );block/block-backend.c +3
-2@@ -1567,14 +1567,15 @@ BlockAIOCB *blk_aio_pwrite_zeroes(BlockBackend *blk, int64_t offset, flags | BDRV_REQ_ZERO_WRITE, cb, opaque); } -int blk_pread (BlockBackend *blk,int64_t offset,void *buf,int bytes) +int blk_pread (BlockBackend *blk,int64_t offset,void *buf,int bytes, +BdrvRequestFlags flags) {int ret;QEMUIOVector qiov =QEMU_IOVEC_INIT_BUF (qiov, buf, bytes);IO_OR_GS_CODE ();blk_inc_in_flight (blk); - ret =blk_do_preadv (blk, offset, bytes, &qiov,0 ); + ret =blk_do_preadv (blk, offset, bytes, &qiov, flags);blk_dec_in_flight (blk);return ret;block/commit.c +1
-1@@ -527,7 +527,7 @@ int bdrv_commit(BlockDriverState *bs) goto ro_cleanup; }if (ret) { - ret =blk_pread (src, offset, buf, n); + ret =blk_pread (src, offset, buf, n,0 );if (ret <0 ) { goto ro_cleanup; }block/export/fuse.c +1
-1@@ -554,7 +554,7 @@ static void fuse_read(fuse_req_t req, fuse_ino_t inode,return ; } - ret =blk_pread (exp->common.blk, offset, buf, size); + ret =blk_pread (exp->common.blk, offset, buf, size,0 );if (ret >=0 ) {fuse_reply_buf (req, buf, size); }else {hw/arm/allwinner-h3.c +1
-1@@ -174,7 +174,7 @@ void allwinner_h3_bootrom_setup(AwH3State *s, BlockBackend *blk)const int64_t rom_size =32 * KiB; g_autofree uint8_t *buffer = g_new0(uint8_t, rom_size); -if (blk_pread (blk,8 * KiB, buffer, rom_size) <0 ) { +if (blk_pread (blk,8 * KiB, buffer, rom_size,0 ) <0 ) {error_setg (&error_fatal,"%s: failed to read BlockBackend data" , __func__);return ;hw/arm/aspeed.c +1
-1@@ -269,7 +269,7 @@ static void write_boot_rom(DriveInfo *dinfo, hwaddr addr, size_t rom_size, } storage =g_malloc0 (rom_size); -if (blk_pread (blk,0 , storage, rom_size) <0 ) { +if (blk_pread (blk,0 , storage, rom_size,0 ) <0 ) {error_setg (errp,"failed to read the initial flash content" );return ; }hw/block/block.c +1
-1@@ -53,7 +53,7 @@ bool blk_check_size_and_read_all(BlockBackend *blk, void *buf, hwaddr size,* block device and read only on demand. */ assert (size <=BDRV_REQUEST_MAX_BYTES ); - ret =blk_pread (blk,0 , buf, size); + ret =blk_pread (blk,0 , buf, size,0 );if (ret <0 ) {error_setg_errno (errp, -ret,"can't read block backend" );return false;hw/block/fdc.c +3
-3@@ -1628,8 +1628,8 @@ int fdctrl_transfer_handler(void *opaque, int nchan, int dma_pos, int dma_len)if (fdctrl->data_dir !=FD_DIR_WRITE || len <FD_SECTOR_LEN || rel_pos !=0 ) {/* READ & SCAN commands and realign to a sector for WRITE */ -if (blk_pread (cur_drv->blk,fd_offset (cur_drv), - fdctrl->fifo,BDRV_SECTOR_SIZE ) <0 ) { +if (blk_pread (cur_drv->blk,fd_offset (cur_drv), fdctrl->fifo, +BDRV_SECTOR_SIZE ,0 ) <0 ) {FLOPPY_DPRINTF ("Floppy: error getting sector %d\n" ,fd_sector (cur_drv));/* Sure, image size is too small... */ @@ -1741,7 +1741,7 @@ static uint32_t fdctrl_read_data(FDCtrl *fdctrl)return 0 ; }if (blk_pread (cur_drv->blk,fd_offset (cur_drv), fdctrl->fifo, -BDRV_SECTOR_SIZE ) +BDRV_SECTOR_SIZE ,0 ) <0 ) {FLOPPY_DPRINTF ("error getting sector %d\n" ,fd_sector (cur_drv));hw/block/hd-geometry.c +1
-1@@ -63,7 +63,7 @@ static int guess_disk_lchs(BlockBackend *blk,blk_get_geometry (blk, &nb_sectors); -if (blk_pread (blk,0 , buf,BDRV_SECTOR_SIZE ) <0 ) { +if (blk_pread (blk,0 , buf,BDRV_SECTOR_SIZE ,0 ) <0 ) {return -1 ; }/* test msdos magic */ hw/block/m25p80.c +1
-1@@ -1506,7 +1506,7 @@ static void m25p80_realize(SSIPeripheral *ss, Error **errp)trace_m25p80_binding (s); s->storage =blk_blockalign (s->blk, s->size); -if (blk_pread (s->blk,0 , s->storage, s->size) <0 ) { +if (blk_pread (s->blk,0 , s->storage, s->size,0 ) <0 ) {error_setg (errp,"failed to read the initial flash content" );return ; }hw/block/nand.c +6
-6@@ -667,7 +667,7 @@ static void glue(nand_blk_write_, NAND_PAGE_SIZE)(NANDFlashState *s) off = (s->addr &PAGE_MASK ) + s->offset; soff =SECTOR_OFFSET (s->addr);if (blk_pread (s->blk, sector <<BDRV_SECTOR_BITS , iobuf, -PAGE_SECTORS <<BDRV_SECTOR_BITS ) <0 ) { +PAGE_SECTORS <<BDRV_SECTOR_BITS ,0 ) <0 ) {printf ("%s: read error in sector %" PRIu64"\n" , __func__, sector);return ; }@@ -688,7 +688,7 @@ static void glue(nand_blk_write_, NAND_PAGE_SIZE)(NANDFlashState *s) sector = off >>9 ; soff = off &0x1ff ;if (blk_pread (s->blk, sector <<BDRV_SECTOR_BITS , iobuf, - (PAGE_SECTORS +2 ) <<BDRV_SECTOR_BITS ) <0 ) { + (PAGE_SECTORS +2 ) <<BDRV_SECTOR_BITS ,0 ) <0 ) {printf ("%s: read error in sector %" PRIu64"\n" , __func__, sector);return ; }@@ -731,7 +731,7 @@ static void glue(nand_blk_erase_, NAND_PAGE_SIZE)(NANDFlashState *s) addr =PAGE_START (addr); page = addr >>9 ;if (blk_pread (s->blk, page <<BDRV_SECTOR_BITS , iobuf, -BDRV_SECTOR_SIZE ) <0 ) { +BDRV_SECTOR_SIZE ,0 ) <0 ) {printf ("%s: read error in sector %" PRIu64"\n" , __func__, page); }memset (iobuf + (addr &0x1ff ),0xff , (~addr &0x1ff ) +1 );@@ -752,7 +752,7 @@ static void glue(nand_blk_erase_, NAND_PAGE_SIZE)(NANDFlashState *s) page = i >>9 ;if (blk_pread (s->blk, page <<BDRV_SECTOR_BITS , iobuf, -BDRV_SECTOR_SIZE ) <0 ) { +BDRV_SECTOR_SIZE ,0 ) <0 ) {printf ("%s: read error in sector %" PRIu64"\n" , __func__, page); }memset (iobuf,0xff , ((addr -1 ) &0x1ff ) +1 );@@ -773,7 +773,7 @@ static void glue(nand_blk_load_, NAND_PAGE_SIZE)(NANDFlashState *s,if (s->blk) {if (s->mem_oob) {if (blk_pread (s->blk,SECTOR (addr) <<BDRV_SECTOR_BITS , s->io, -PAGE_SECTORS <<BDRV_SECTOR_BITS ) <0 ) { +PAGE_SECTORS <<BDRV_SECTOR_BITS ,0 ) <0 ) {printf ("%s: read error in sector %" PRIu64"\n" , __func__,SECTOR (addr)); }@@ -783,7 +783,7 @@ static void glue(nand_blk_load_, NAND_PAGE_SIZE)(NANDFlashState *s, s->ioaddr = s->io +SECTOR_OFFSET (s->addr) + offset; }else {if (blk_pread (s->blk,PAGE_START (addr), s->io, - (PAGE_SECTORS +2 ) <<BDRV_SECTOR_BITS ) <0 ) { + (PAGE_SECTORS +2 ) <<BDRV_SECTOR_BITS ,0 ) <0 ) {printf ("%s: read error in sector %" PRIu64"\n" , __func__,PAGE_START (addr) >>9 ); }hw/block/onenand.c +6
-6@@ -230,7 +230,7 @@ static void onenand_reset(OneNANDState *s, int cold)memset (s->blockwp,ONEN_LOCK_LOCKED , s->blocks);if (s->blk_cur &&blk_pread (s->blk_cur,0 , s->boot[0 ], -8 <<BDRV_SECTOR_BITS ) <0 ) { +8 <<BDRV_SECTOR_BITS ,0 ) <0 ) {hw_error ("%s: Loading the BootRAM failed.\n" , __func__); } }@@ -250,7 +250,7 @@ static inline int onenand_load_main(OneNANDState *s, int sec, int secn,assert (UINT32_MAX >>BDRV_SECTOR_BITS > secn);if (s->blk_cur) {return blk_pread (s->blk_cur, sec <<BDRV_SECTOR_BITS , dest, - secn <<BDRV_SECTOR_BITS ) <0 ; + secn <<BDRV_SECTOR_BITS ,0 ) <0 ; }else if (sec + secn > s->secs_cur) {return 1 ; }@@ -274,7 +274,7 @@ static inline int onenand_prog_main(OneNANDState *s, int sec, int secn,uint8_t *dp =0 ;if (s->blk_cur) { dp =g_malloc (size); -if (!dp ||blk_pread (s->blk_cur, offset, dp, size) <0 ) { +if (!dp ||blk_pread (s->blk_cur, offset, dp, size,0 ) <0 ) { result =1 ; } }else {@@ -308,7 +308,7 @@ static inline int onenand_load_spare(OneNANDState *s, int sec, int secn,if (s->blk_cur) {uint32_t offset = (s->secs_cur + (sec >>5 )) <<BDRV_SECTOR_BITS ; -if (blk_pread (s->blk_cur, offset, buf,BDRV_SECTOR_SIZE ) <0 ) { +if (blk_pread (s->blk_cur, offset, buf,BDRV_SECTOR_SIZE ,0 ) <0 ) {return 1 ; }memcpy (dest, buf + ((sec &31 ) <<4 ), secn <<4 );@@ -333,7 +333,7 @@ static inline int onenand_prog_spare(OneNANDState *s, int sec, int secn,if (s->blk_cur) { dp =g_malloc (512 );if (!dp - ||blk_pread (s->blk_cur, offset, dp,BDRV_SECTOR_SIZE ) <0 ) { + ||blk_pread (s->blk_cur, offset, dp,BDRV_SECTOR_SIZE ,0 ) <0 ) { result =1 ; }else { dpp = dp + ((sec &31 ) <<4 );@@ -375,7 +375,7 @@ static inline int onenand_erase(OneNANDState *s, int sec, int num) goto fail; }if (blk_pread (s->blk_cur, erasesec <<BDRV_SECTOR_BITS , tmpbuf, -BDRV_SECTOR_SIZE ) <0 ) { +BDRV_SECTOR_SIZE ,0 ) <0 ) { goto fail; }memcpy (tmpbuf + ((sec &31 ) <<4 ), blankbuf,1 <<4 );hw/ide/atapi.c +2
-2@@ -98,11 +98,11 @@ cd_read_sector_sync(IDEState *s)switch (s->cd_sector_size) {case 2048 : ret =blk_pread (s->blk, (int64_t )s->lba <<ATAPI_SECTOR_BITS , - s->io_buffer,ATAPI_SECTOR_SIZE ); + s->io_buffer,ATAPI_SECTOR_SIZE ,0 );break ;case 2352 : ret =blk_pread (s->blk, (int64_t )s->lba <<ATAPI_SECTOR_BITS , - s->io_buffer +16 ,ATAPI_SECTOR_SIZE ); + s->io_buffer +16 ,ATAPI_SECTOR_SIZE ,0 );if (ret >=0 ) {cd_data_to_raw (s->io_buffer, s->lba); }hw/misc/mac_via.c +1
-1@@ -1029,7 +1029,7 @@ static void mos6522_q800_via1_realize(DeviceState *dev, Error **errp)return ; } - len =blk_pread (v1s->blk,0 , v1s->PRAM,sizeof (v1s->PRAM)); + len =blk_pread (v1s->blk,0 , v1s->PRAM,sizeof (v1s->PRAM),0 );if (len <0 ) {error_setg (errp,"can't read PRAM contents" );return ;hw/misc/sifive_u_otp.c +2
-2@@ -65,7 +65,7 @@ static uint64_t sifive_u_otp_read(void *opaque, hwaddr addr, unsigned int size)int32_t buf;if (blk_pread (s->blk, s->pa *SIFIVE_U_OTP_FUSE_WORD , &buf, -SIFIVE_U_OTP_FUSE_WORD ) <0 ) { +SIFIVE_U_OTP_FUSE_WORD ,0 ) <0 ) {error_report ("read error index<%d>" , s->pa);return 0xff ; }@@ -240,7 +240,7 @@ static void sifive_u_otp_realize(DeviceState *dev, Error **errp)return ; } -if (blk_pread (s->blk,0 , s->fuse, filesize) <0 ) { +if (blk_pread (s->blk,0 , s->fuse, filesize,0 ) <0 ) {error_setg (errp,"failed to read the initial flash content" );return ; }hw/nvram/eeprom_at24c.c +1
-1@@ -163,7 +163,7 @@ void at24c_eeprom_reset(DeviceState *state)memset (ee->mem,0 , ee->rsize);if (ee->blk) { -int len =blk_pread (ee->blk,0 , ee->mem, ee->rsize); +int len =blk_pread (ee->blk,0 , ee->mem, ee->rsize,0 );if (len <0 ) { ERR(TYPE_AT24C_EEhw/nvram/spapr_nvram.c +1
-1@@ -179,7 +179,7 @@ static void spapr_nvram_realize(SpaprVioDevice *dev, Error **errp) }if (nvram->blk) { -int alen =blk_pread (nvram->blk,0 , nvram->buf, nvram->size); +int alen =blk_pread (nvram->blk,0 , nvram->buf, nvram->size,0 );if (alen <0 ) {error_setg (errp,"can't read spapr-nvram contents" );hw/nvram/xlnx-bbram.c +1
-1@@ -124,7 +124,7 @@ static void bbram_bdrv_read(XlnxBBRam *s, Error **errp) blk_name(s->blk)); } -if (blk_pread (s->blk,0 , ram, nr) <0 ) { +if (blk_pread (s->blk,0 , ram, nr,0 ) <0 ) {error_setg (errp,"%s: Failed to read %u bytes from BBRAM backstore." ,blk_name (s->blk), nr);hw/nvram/xlnx-efuse.c +1
-1@@ -77,7 +77,7 @@ static int efuse_bdrv_read(XlnxEFuse *s, Error **errp) blk_name(s->blk)); } -if (blk_pread (s->blk,0 , ram, nr) <0 ) { +if (blk_pread (s->blk,0 , ram, nr,0 ) <0 ) {error_setg (errp,"%s: Failed to read %u bytes from eFUSE backstore." ,blk_name (s->blk), nr);return -1 ;hw/ppc/pnv_pnor.c +1
-1@@ -99,7 +99,7 @@ static void pnv_pnor_realize(DeviceState *dev, Error **errp) s->storage =blk_blockalign (s->blk, s->size); -if (blk_pread (s->blk,0 , s->storage, s->size) <0 ) { +if (blk_pread (s->blk,0 , s->storage, s->size,0 ) <0 ) {error_setg (errp,"failed to read the initial flash content" );return ; }hw/sd/sd.c +1
-1@@ -752,7 +752,7 @@ void sd_set_cb(SDState *sd, qemu_irq readonly, qemu_irq insert)static void sd_blk_read (SDState *sd,uint64_t addr,uint32_t len) {trace_sdcard_read_block (addr, len); -if (!sd->blk ||blk_pread (sd->blk, addr, sd->data, len) <0 ) { +if (!sd->blk ||blk_pread (sd->blk, addr, sd->data, len,0 ) <0 ) {fprintf (stderr,"sd_blk_read: read error on host side\n" ); } }include/sysemu/block-backend-io.h +2
-1@@ -102,7 +102,8 @@ int coroutine_fn blk_co_copy_range(BlockBackend *blk_in, int64_t off_in,* the "I/O or GS" API. */ -int blk_pread (BlockBackend *blk,int64_t offset,void *buf,int bytes); +int blk_pread (BlockBackend *blk,int64_t offset,void *buf,int bytes, +BdrvRequestFlags flags);int blk_pwrite (BlockBackend *blk,int64_t offset,const void *buf,int bytes,BdrvRequestFlags flags); int coroutine_fn blk_co_preadv(BlockBackend *blk, int64_t offset,migration/block.c +2
-2@@ -568,8 +568,8 @@ static int mig_save_device_dirty(QEMUFile *f, BlkMigDevState *bmds,bmds_set_aio_inflight (bmds, sector, nr_sectors,1 );blk_mig_unlock (); }else { - ret =blk_pread (bmds->blk, sector *BDRV_SECTOR_SIZE , blk->buf, - nr_sectors *BDRV_SECTOR_SIZE ); + ret =blk_pread (bmds->blk, sector *BDRV_SECTOR_SIZE , + blk->buf, nr_sectors *BDRV_SECTOR_SIZE ,0 );if (ret <0 ) { goto error; }nbd/server.c +2
-2@@ -2040,7 +2040,7 @@ static int coroutine_fn nbd_co_send_sparse_read(NBDClient *client, ret =nbd_co_send_iov (client, iov,1 , errp); }else { ret =blk_pread (exp->common.blk, offset + progress, - data + progress, pnum); + data + progress, pnum,0 );if (ret <0 ) {error_setg_errno (errp, -ret,"reading from file failed" );break ;@@ -2444,7 +2444,7 @@ static coroutine_fn int nbd_do_cmd_read(NBDClient *client, NBDRequest *request, data, request->len, errp); } - ret =blk_pread (exp->common.blk, request->from, data, request->len); + ret =blk_pread (exp->common.blk, request->from, data, request->len,0 );if (ret <0 ) {return nbd_send_generic_reply (client, request->handle, ret,"reading from file failed" , errp);qemu-img.c +6
-6@@ -1309,7 +1309,7 @@ static int check_empty_sectors(BlockBackend *blk, int64_t offset,int ret =0 ;int64_t idx; - ret =blk_pread (blk, offset, buffer, bytes); + ret =blk_pread (blk, offset, buffer, bytes,0 );if (ret <0 ) {error_report ("Error while reading offset %" PRId64" of %s: %s" , offset, filename,strerror (-ret));@@ -1526,7 +1526,7 @@ static int img_compare(int argc, char **argv)int64_t pnum; chunk =MIN (chunk,IO_BUF_SIZE ); - ret =blk_pread (blk1, offset, buf1, chunk); + ret =blk_pread (blk1, offset, buf1, chunk,0 );if (ret <0 ) { error_report("Error while reading offset %" PRId64 " of %s: %s",@@ -1534,7 +1534,7 @@ static int img_compare(int argc, char **argv) ret =4 ; goto out; } - ret =blk_pread (blk2, offset, buf2, chunk); + ret =blk_pread (blk2, offset, buf2, chunk,0 );if (ret <0 ) { error_report("Error while reading offset %" PRId64 " of %s: %s",@@ -3779,7 +3779,7 @@ static int img_rebase(int argc, char **argv) n = old_backing_size - offset; } - ret =blk_pread (blk_old_backing, offset, buf_old, n); + ret =blk_pread (blk_old_backing, offset, buf_old, n,0 );if (ret <0 ) {error_report ("error while reading from old backing file" ); goto out;@@ -3793,7 +3793,7 @@ static int img_rebase(int argc, char **argv) n = new_backing_size - offset; } - ret =blk_pread (blk_new_backing, offset, buf_new, n); + ret =blk_pread (blk_new_backing, offset, buf_new, n,0 );if (ret <0 ) {error_report ("error while reading from new backing file" ); goto out;@@ -5124,7 +5124,7 @@ static int img_dd(int argc, char **argv) bytes = (in_pos + in.bsz > size) ? size - in_pos : in.bsz; - in_ret =blk_pread (blk1, in_pos, in.buf, bytes); + in_ret =blk_pread (blk1, in_pos, in.buf, bytes,0 );if (in_ret <0 ) {error_report ("error while reading from input image file: %s" ,strerror (-in_ret));qemu-io-cmds.c +1
-1@@ -547,7 +547,7 @@ static int do_pread(BlockBackend *blk, char *buf, int64_t offset,return -ERANGE ; } - ret =blk_pread (blk, offset, (uint8_t *)buf, bytes); + ret =blk_pread (blk, offset, (uint8_t *)buf, bytes,0 );if (ret <0 ) {return ret; }tests/unit/test-block-iothread.c +2
-2@@ -116,11 +116,11 @@ static void test_sync_op_blk_pread(BlockBackend *blk)int ret;/* Success */ - ret =blk_pread (blk,0 , buf,sizeof (buf)); + ret =blk_pread (blk,0 , buf,sizeof (buf),0 ); g_assert_cmpint(ret, ==, 0);/* Early error: Negative offset */ - ret =blk_pread (blk,-2 , buf,sizeof (buf)); + ret =blk_pread (blk,-2 , buf,sizeof (buf),0 ); g_assert_cmpint(ret, ==, -EIO); }
Re: [PATCH 02/18] block: Add a 'flags' param to blk_pread()
In reply to Alberto FariaQuoted 36 lines · Alberto Faria
For consistency with other I/O functions, and in preparation to implement it using
generated_co_wrapper.Callers were updated using this Coccinelle script:
@@ expression blk, offset, buf, bytes; @@
-blk_pread(blk, offset, buf, bytes)
+blk_pread(blk, offset, buf, bytes, 0)It had no effect on
hw/block/nand.c, presumably due to the #if, so that file was updated manually.Overly-long lines were then fixed by hand.
Signed-off-by Alberto Faria <[email protected]>--- block.c | 2 +- block/block-backend.c | 5 +++-- block/commit.c | 2 +- block/export/fuse.c | 2 +- hw/arm/allwinner-h3.c | 2 +- hw/arm/aspeed.c | 2 +- hw/block/block.c | 2 +- hw/block/fdc.c | 6 +++--- hw/block/hd-geometry.c | 2 +- hw/block/m25p80.c | 2 +- hw/block/nand.c | 12 ++++++------ hw/block/onenand.c | 12 ++++++------ hw/ide/atapi.c | 4 ++-- hw/misc/mac_via.c | 2 +- hw/misc/sifive_u_otp.c | 4 ++-- hw/nvram/eeprom_at24c.c | 2 +- hw/nvram/spapr_nvram.c | 2 +- hw/nvram/xlnx-bbram.c | 2 +- hw/nvram/xlnx-efuse.c | 2 +- hw/ppc/pnv_pnor.c | 2 +-
Quoted 8 lines
hw/sd/sd.c | 2 +- include/sysemu/block-backend-io.h | 3 ++- migration/block.c | 4 ++-- nbd/server.c | 4 ++-- qemu-img.c | 12 ++++++------ qemu-io-cmds.c | 2 +- tests/unit/test-block-iothread.c | 4 ++-- 27 files changed, 52 insertions(+), 50 deletions(-)
PATCH 3/18 block: Change blk_{pread,pwrite}() param order
In reply to Alberto FariaSwap 'buf' and 'bytes' around for consistency with blk_co_{pread,pwrite}(), and in preparation to implement these functions using generated_co_wrapper.
Callers were updated using this Coccinelle script:
@@ expression blk, offset, buf, bytes, flags; @@
- blk_pread(blk, offset, buf, bytes, flags)
+ blk_pread(blk, offset, bytes, buf, flags)
@@ expression blk, offset, buf, bytes, flags; @@
- blk_pwrite(blk, offset, buf, bytes, flags)
+ blk_pwrite(blk, offset, bytes, buf, flags)
It had no effect on hw/block/nand.c, presumably due to the #if, so that file was updated manually.
Overly-long lines were then fixed by hand.
--- block.c | 2 +- block/block-backend.c | 4 +-- block/commit.c | 4 +-- block/crypto.c | 2 +- block/export/fuse.c | 4 +-- block/parallels.c | 2 +- block/qcow.c | 8 +++--- block/qcow2.c | 4 +-- block/qed.c | 8 +++--- block/vdi.c | 4 +-- block/vhdx.c | 20 ++++++------- block/vmdk.c | 10 +++---- block/vpc.c | 12 ++++---- hw/arm/allwinner-h3.c | 2 +- hw/arm/aspeed.c | 2 +- hw/block/block.c | 2 +- hw/block/fdc.c | 20 ++++++------- hw/block/hd-geometry.c | 2 +- hw/block/m25p80.c | 2 +- hw/block/nand.c | 47 ++++++++++++++++--------------- hw/block/onenand.c | 32 ++++++++++----------- hw/block/pflash_cfi01.c | 4 +-- hw/block/pflash_cfi02.c | 4 +-- hw/ide/atapi.c | 4 +-- hw/misc/mac_via.c | 4 +-- hw/misc/sifive_u_otp.c | 14 ++++----- hw/nvram/eeprom_at24c.c | 4 +-- hw/nvram/spapr_nvram.c | 6 ++-- hw/nvram/xlnx-bbram.c | 4 +-- hw/nvram/xlnx-efuse.c | 4 +-- hw/ppc/pnv_pnor.c | 6 ++-- hw/sd/sd.c | 4 +-- include/sysemu/block-backend-io.h | 4 +-- migration/block.c | 6 ++-- nbd/server.c | 8 +++--- qemu-img.c | 18 ++++++------ qemu-io-cmds.c | 4 +-- tests/unit/test-block-iothread.c | 8 +++--- 38 files changed, 150 insertions(+), 149 deletions(-)
block.c +1 -1
@@ -1037,7 +1037,7 @@ static int find_image_format(BlockBackend *file, const char *filename,return ret; } - ret =blk_pread (file,0 , buf,sizeof (buf),0 ); + ret =blk_pread (file,0 ,sizeof (buf), buf,0 );if (ret <0 ) {error_setg_errno (errp, -ret,"Could not read image for determining its " "format" );
block/block-backend.c +2 -2
@@ -1567,7 +1567,7 @@ BlockAIOCB *blk_aio_pwrite_zeroes(BlockBackend *blk, int64_t offset, flags | BDRV_REQ_ZERO_WRITE, cb, opaque); } -int blk_pread (BlockBackend *blk,int64_t offset,void *buf,int bytes, +int blk_pread (BlockBackend *blk,int64_t offset,int bytes,void *buf,BdrvRequestFlags flags) {int ret;
@@ -1581,7 +1581,7 @@ int blk_pread(BlockBackend *blk, int64_t offset, void *buf, int bytes,return ret; } -int blk_pwrite (BlockBackend *blk,int64_t offset,const void *buf,int bytes, +int blk_pwrite (BlockBackend *blk,int64_t offset,int bytes,const void *buf,BdrvRequestFlags flags) {QEMUIOVector qiov =QEMU_IOVEC_INIT_BUF (qiov, buf, bytes);
block/commit.c +2 -2
@@ -527,12 +527,12 @@ int bdrv_commit(BlockDriverState *bs) goto ro_cleanup; }if (ret) { - ret =blk_pread (src, offset, buf, n,0 ); + ret =blk_pread (src, offset, n, buf,0 );if (ret <0 ) { goto ro_cleanup; } - ret =blk_pwrite (backing, offset, buf, n,0 ); + ret =blk_pwrite (backing, offset, n, buf,0 );if (ret <0 ) { goto ro_cleanup; }
block/crypto.c +1 -1
@@ -109,7 +109,7 @@ static int block_crypto_create_write_func(QCryptoBlock *block,struct BlockCryptoCreateData *data = opaque;ssize_t ret; - ret =blk_pwrite (data->blk, offset, buf, buflen,0 ); + ret =blk_pwrite (data->blk, offset, buflen, buf,0 );if (ret <0 ) {error_setg_errno (errp, -ret,"Could not write encryption header" );return ret;
block/export/fuse.c +2 -2
@@ -554,7 +554,7 @@ static void fuse_read(fuse_req_t req, fuse_ino_t inode,return ; } - ret =blk_pread (exp->common.blk, offset, buf, size,0 ); + ret =blk_pread (exp->common.blk, offset, size, buf,0 );if (ret >=0 ) {fuse_reply_buf (req, buf, size); }else {
@@ -607,7 +607,7 @@ static void fuse_write(fuse_req_t req, fuse_ino_t inode, const char *buf, } } - ret =blk_pwrite (exp->common.blk, offset, buf, size,0 ); + ret =blk_pwrite (exp->common.blk, offset, size, buf,0 );if (ret >=0 ) {fuse_reply_write (req, size); }else {
block/parallels.c +1 -1
@@ -599,7 +599,7 @@ static int coroutine_fn parallels_co_create(BlockdevCreateOptions* opts,memset (tmp,0 ,sizeof (tmp));memcpy (tmp, &header,sizeof (header)); - ret =blk_pwrite (blk,0 , tmp,BDRV_SECTOR_SIZE ,0 ); + ret =blk_pwrite (blk,0 ,BDRV_SECTOR_SIZE , tmp,0 );if (ret <0 ) { goto exit; }
block/qcow.c +4 -4
@@ -890,14 +890,14 @@ static int coroutine_fn qcow_co_create(BlockdevCreateOptions *opts, }/* write all the data */ - ret =blk_pwrite (qcow_blk,0 , &header,sizeof (header),0 ); + ret =blk_pwrite (qcow_blk,0 ,sizeof (header), &header,0 );if (ret <0 ) { goto exit; }if (qcow_opts->has_backing_file) { - ret =blk_pwrite (qcow_blk,sizeof (header), - qcow_opts->backing_file, backing_filename_len,0 ); + ret =blk_pwrite (qcow_blk,sizeof (header), backing_filename_len, + qcow_opts->backing_file,0 );if (ret <0 ) { goto exit; }
@@ -907,7 +907,7 @@ static int coroutine_fn qcow_co_create(BlockdevCreateOptions *opts,for (i =0 ; i <DIV_ROUND_UP (sizeof (uint64_t ) * l1_size,BDRV_SECTOR_SIZE ); i++) { ret =blk_pwrite (qcow_blk, header_size +BDRV_SECTOR_SIZE * i, - tmp,BDRV_SECTOR_SIZE ,0 ); +BDRV_SECTOR_SIZE , tmp,0 );if (ret <0 ) {g_free (tmp); goto exit;
block/qcow2.c +2 -2
@@ -3666,7 +3666,7 @@ qcow2_co_create(BlockdevCreateOptions *create_options, Error **errp)cpu_to_be64 (QCOW2_INCOMPAT_EXTL2 ); } - ret =blk_pwrite (blk,0 , header, cluster_size,0 ); + ret =blk_pwrite (blk,0 , cluster_size, header,0 );g_free (header);if (ret <0 ) {error_setg_errno (errp, -ret,"Could not write qcow2 header" );
@@ -3676,7 +3676,7 @@ qcow2_co_create(BlockdevCreateOptions *create_options, Error **errp)/* Write a refcount table with one refcount block */ refcount_table =g_malloc0 (2 * cluster_size); refcount_table[0 ] =cpu_to_be64 (2 * cluster_size); - ret =blk_pwrite (blk, cluster_size, refcount_table,2 * cluster_size,0 ); + ret =blk_pwrite (blk, cluster_size,2 * cluster_size, refcount_table,0 );g_free (refcount_table);if (ret <0 ) {
block/qed.c +4 -4
@@ -705,18 +705,18 @@ static int coroutine_fn bdrv_qed_co_create(BlockdevCreateOptions *opts, }qed_header_cpu_to_le (&header, &le_header); - ret =blk_pwrite (blk,0 , &le_header,sizeof (le_header),0 ); + ret =blk_pwrite (blk,0 ,sizeof (le_header), &le_header,0 );if (ret <0 ) { goto out; } - ret =blk_pwrite (blk,sizeof (le_header), qed_opts->backing_file, - header.backing_filename_size,0 ); + ret =blk_pwrite (blk,sizeof (le_header), header.backing_filename_size, + qed_opts->backing_file,0 );if (ret <0 ) { goto out; } l1_table =g_malloc0 (l1_size); - ret =blk_pwrite (blk, header.l1_table_offset, l1_table, l1_size,0 ); + ret =blk_pwrite (blk, header.l1_table_offset, l1_size, l1_table,0 );if (ret <0 ) { goto out; }
block/vdi.c +2 -2
@@ -845,7 +845,7 @@ static int coroutine_fn vdi_co_do_create(BlockdevCreateOptions *create_options,vdi_header_print (&header); }vdi_header_to_le (&header); - ret =blk_pwrite (blk, offset, &header,sizeof (header),0 ); + ret =blk_pwrite (blk, offset,sizeof (header), &header,0 );if (ret <0 ) {error_setg (errp,"Error writing header" ); goto exit;
@@ -866,7 +866,7 @@ static int coroutine_fn vdi_co_do_create(BlockdevCreateOptions *create_options, bmap[i] =VDI_UNALLOCATED ; } } - ret =blk_pwrite (blk, offset, bmap, bmap_size,0 ); + ret =blk_pwrite (blk, offset, bmap_size, bmap,0 );if (ret <0 ) {error_setg (errp,"Error writing bmap" ); goto exit;
block/vhdx.c +10 -10
@@ -1665,13 +1665,13 @@ static int vhdx_create_new_metadata(BlockBackend *blk,VHDX_META_FLAGS_IS_VIRTUAL_DISK ;vhdx_metadata_entry_le_export (&md_table_entry[4 ]); - ret =blk_pwrite (blk, metadata_offset, buffer,VHDX_HEADER_BLOCK_SIZE ,0 ); + ret =blk_pwrite (blk, metadata_offset,VHDX_HEADER_BLOCK_SIZE , buffer,0 );if (ret <0 ) { goto exit; } - ret =blk_pwrite (blk, metadata_offset + (64 * KiB), entry_buffer, -VHDX_METADATA_ENTRY_BUFFER_SIZE ,0 ); + ret =blk_pwrite (blk, metadata_offset + (64 * KiB), +VHDX_METADATA_ENTRY_BUFFER_SIZE , entry_buffer,0 );if (ret <0 ) { goto exit; }
@@ -1756,7 +1756,7 @@ static int vhdx_create_bat(BlockBackend *blk, BDRVVHDXState *s, s->bat[sinfo.bat_idx] =cpu_to_le64 (s->bat[sinfo.bat_idx]); sector_num += s->sectors_per_block; } - ret =blk_pwrite (blk, file_offset, s->bat, length,0 ); + ret =blk_pwrite (blk, file_offset, length, s->bat,0 );if (ret <0 ) {error_setg_errno (errp, -ret,"Failed to write the BAT" ); goto exit;
@@ -1860,15 +1860,15 @@ static int vhdx_create_new_region_table(BlockBackend *blk, }/* Now write out the region headers to disk */ - ret =blk_pwrite (blk,VHDX_REGION_TABLE_OFFSET , buffer, -VHDX_HEADER_BLOCK_SIZE ,0 ); + ret =blk_pwrite (blk,VHDX_REGION_TABLE_OFFSET ,VHDX_HEADER_BLOCK_SIZE , + buffer,0 );if (ret <0 ) {error_setg_errno (errp, -ret,"Failed to write first region table" ); goto exit; } - ret =blk_pwrite (blk,VHDX_REGION_TABLE2_OFFSET , buffer, -VHDX_HEADER_BLOCK_SIZE ,0 ); + ret =blk_pwrite (blk,VHDX_REGION_TABLE2_OFFSET ,VHDX_HEADER_BLOCK_SIZE , + buffer,0 );if (ret <0 ) {error_setg_errno (errp, -ret,"Failed to write second region table" ); goto exit;
@@ -2012,7 +2012,7 @@ static int coroutine_fn vhdx_co_create(BlockdevCreateOptions *opts, creator =g_utf8_to_utf16 ("QEMU v" QEMU_VERSION ,-1 ,NULL , &creator_items,NULL ); signature =cpu_to_le64 (VHDX_FILE_SIGNATURE ); - ret =blk_pwrite (blk,VHDX_FILE_ID_OFFSET , &signature,sizeof (signature), + ret =blk_pwrite (blk,VHDX_FILE_ID_OFFSET ,sizeof (signature), &signature,0 );if (ret <0 ) {error_setg_errno (errp, -ret,"Failed to write file signature" );
@@ -2020,7 +2020,7 @@ static int coroutine_fn vhdx_co_create(BlockdevCreateOptions *opts, }if (creator) { ret =blk_pwrite (blk,VHDX_FILE_ID_OFFSET +sizeof (signature), - creator, creator_items *sizeof (gunichar2),0 ); + creator_items *sizeof (gunichar2), creator,0 );if (ret <0 ) {error_setg_errno (errp, -ret,"Failed to write creator field" ); goto delete_and_exit;
block/vmdk.c +5 -5
@@ -2236,12 +2236,12 @@ static int vmdk_init_extent(BlockBackend *blk, header.check_bytes[3 ] =0xa ;/* write all the data */ - ret =blk_pwrite (blk,0 , &magic,sizeof (magic),0 ); + ret =blk_pwrite (blk,0 ,sizeof (magic), &magic,0 );if (ret <0 ) {error_setg (errp,QERR_IO_ERROR ); goto exit; } - ret =blk_pwrite (blk,sizeof (magic), &header,sizeof (header),0 ); + ret =blk_pwrite (blk,sizeof (magic),sizeof (header), &header,0 );if (ret <0 ) {error_setg (errp,QERR_IO_ERROR ); goto exit;
@@ -2261,7 +2261,7 @@ static int vmdk_init_extent(BlockBackend *blk, gd_buf[i] =cpu_to_le32 (tmp); } ret =blk_pwrite (blk,le64_to_cpu (header.rgd_offset) *BDRV_SECTOR_SIZE , - gd_buf, gd_buf_size,0 ); + gd_buf_size, gd_buf,0 );if (ret <0 ) {error_setg (errp,QERR_IO_ERROR ); goto exit;
@@ -2273,7 +2273,7 @@ static int vmdk_init_extent(BlockBackend *blk, gd_buf[i] =cpu_to_le32 (tmp); } ret =blk_pwrite (blk,le64_to_cpu (header.gd_offset) *BDRV_SECTOR_SIZE , - gd_buf, gd_buf_size,0 ); + gd_buf_size, gd_buf,0 );if (ret <0 ) {error_setg (errp,QERR_IO_ERROR ); }
@@ -2584,7 +2584,7 @@ static int coroutine_fn vmdk_co_do_create(int64_t size, desc_offset =0x200 ; } - ret =blk_pwrite (blk, desc_offset, desc, desc_len,0 ); + ret =blk_pwrite (blk, desc_offset, desc_len, desc,0 );if (ret <0 ) {error_setg_errno (errp, -ret,"Could not write description" ); goto exit;
block/vpc.c +6 -6
@@ -834,13 +834,13 @@ static int create_dynamic_disk(BlockBackend *blk, VHDFooter *footer, block_size =0x200000 ; num_bat_entries =DIV_ROUND_UP (total_sectors, block_size /512 ); - ret =blk_pwrite (blk, offset, footer,sizeof (*footer),0 ); + ret =blk_pwrite (blk, offset,sizeof (*footer), footer,0 );if (ret <0 ) { goto fail; } offset =1536 + ((num_bat_entries *4 +511 ) & ~511 ); - ret =blk_pwrite (blk, offset, footer,sizeof (*footer),0 ); + ret =blk_pwrite (blk, offset,sizeof (*footer), footer,0 );if (ret <0 ) { goto fail; }
@@ -850,7 +850,7 @@ static int create_dynamic_disk(BlockBackend *blk, VHDFooter *footer,memset (bat_sector,0xFF ,512 );for (i =0 ; i <DIV_ROUND_UP (num_bat_entries *4 ,512 ); i++) { - ret =blk_pwrite (blk, offset, bat_sector,512 ,0 ); + ret =blk_pwrite (blk, offset,512 , bat_sector,0 );if (ret <0 ) { goto fail; }
@@ -878,7 +878,7 @@ static int create_dynamic_disk(BlockBackend *blk, VHDFooter *footer,/* Write the header */ offset =512 ; - ret =blk_pwrite (blk, offset, &dyndisk_header,sizeof (dyndisk_header),0 ); + ret =blk_pwrite (blk, offset,sizeof (dyndisk_header), &dyndisk_header,0 );if (ret <0 ) { goto fail; }
@@ -901,8 +901,8 @@ static int create_fixed_disk(BlockBackend *blk, VHDFooter *footer,return ret; } - ret =blk_pwrite (blk, total_size -sizeof (*footer), - footer,sizeof (*footer),0 ); + ret =blk_pwrite (blk, total_size -sizeof (*footer),sizeof (*footer), + footer,0 );if (ret <0 ) {error_setg_errno (errp, -ret,"Unable to write VHD header" );return ret;
hw/arm/allwinner-h3.c +1 -1
@@ -174,7 +174,7 @@ void allwinner_h3_bootrom_setup(AwH3State *s, BlockBackend *blk)const int64_t rom_size =32 * KiB; g_autofree uint8_t *buffer = g_new0(uint8_t, rom_size); -if (blk_pread (blk,8 * KiB, buffer, rom_size,0 ) <0 ) { +if (blk_pread (blk,8 * KiB, rom_size, buffer,0 ) <0 ) {error_setg (&error_fatal,"%s: failed to read BlockBackend data" , __func__);return ;
hw/arm/aspeed.c +1 -1
@@ -269,7 +269,7 @@ static void write_boot_rom(DriveInfo *dinfo, hwaddr addr, size_t rom_size, } storage =g_malloc0 (rom_size); -if (blk_pread (blk,0 , storage, rom_size,0 ) <0 ) { +if (blk_pread (blk,0 , rom_size, storage,0 ) <0 ) {error_setg (errp,"failed to read the initial flash content" );return ; }
hw/block/block.c +1 -1
@@ -53,7 +53,7 @@ bool blk_check_size_and_read_all(BlockBackend *blk, void *buf, hwaddr size,* block device and read only on demand. */ assert (size <=BDRV_REQUEST_MAX_BYTES ); - ret =blk_pread (blk,0 , buf, size,0 ); + ret =blk_pread (blk,0 , size, buf,0 );if (ret <0 ) {error_setg_errno (errp, -ret,"can't read block backend" );return false;
hw/block/fdc.c +10 -10
@@ -1628,8 +1628,8 @@ int fdctrl_transfer_handler(void *opaque, int nchan, int dma_pos, int dma_len)if (fdctrl->data_dir !=FD_DIR_WRITE || len <FD_SECTOR_LEN || rel_pos !=0 ) {/* READ & SCAN commands and realign to a sector for WRITE */ -if (blk_pread (cur_drv->blk,fd_offset (cur_drv), fdctrl->fifo, -BDRV_SECTOR_SIZE ,0 ) <0 ) { +if (blk_pread (cur_drv->blk,fd_offset (cur_drv),BDRV_SECTOR_SIZE , + fdctrl->fifo,0 ) <0 ) {FLOPPY_DPRINTF ("Floppy: error getting sector %d\n" ,fd_sector (cur_drv));/* Sure, image size is too small... */
@@ -1656,8 +1656,8 @@ int fdctrl_transfer_handler(void *opaque, int nchan, int dma_pos, int dma_len) k->read_memory (fdctrl->dma, nchan, fdctrl->fifo + rel_pos, fdctrl->data_pos, len); -if (blk_pwrite (cur_drv->blk,fd_offset (cur_drv), - fdctrl->fifo,BDRV_SECTOR_SIZE ,0 ) <0 ) { +if (blk_pwrite (cur_drv->blk,fd_offset (cur_drv),BDRV_SECTOR_SIZE , + fdctrl->fifo,0 ) <0 ) {FLOPPY_DPRINTF ("error writing sector %d\n" ,fd_sector (cur_drv));fdctrl_stop_transfer (fdctrl,FD_SR0_ABNTERM |FD_SR0_SEEK ,0x00 ,0x00 );
@@ -1740,8 +1740,8 @@ static uint32_t fdctrl_read_data(FDCtrl *fdctrl) fd_sector(cur_drv));return 0 ; } -if (blk_pread (cur_drv->blk,fd_offset (cur_drv), fdctrl->fifo, -BDRV_SECTOR_SIZE ,0 ) +if (blk_pread (cur_drv->blk,fd_offset (cur_drv),BDRV_SECTOR_SIZE , + fdctrl->fifo,0 ) <0 ) {FLOPPY_DPRINTF ("error getting sector %d\n" ,fd_sector (cur_drv));
@@ -1820,8 +1820,8 @@ static void fdctrl_format_sector(FDCtrl *fdctrl) }memset (fdctrl->fifo,0 ,FD_SECTOR_LEN );if (cur_drv->blk ==NULL || -blk_pwrite (cur_drv->blk,fd_offset (cur_drv), fdctrl->fifo, -BDRV_SECTOR_SIZE ,0 ) <0 ) { +blk_pwrite (cur_drv->blk,fd_offset (cur_drv),BDRV_SECTOR_SIZE , + fdctrl->fifo,0 ) <0 ) {FLOPPY_DPRINTF ("error formatting sector %d\n" ,fd_sector (cur_drv));fdctrl_stop_transfer (fdctrl,FD_SR0_ABNTERM |FD_SR0_SEEK ,0x00 ,0x00 ); }else {
@@ -2244,8 +2244,8 @@ static void fdctrl_write_data(FDCtrl *fdctrl, uint32_t value)if (pos ==FD_SECTOR_LEN -1 || fdctrl->data_pos == fdctrl->data_len) { cur_drv =get_cur_drv (fdctrl); -if (blk_pwrite (cur_drv->blk,fd_offset (cur_drv), fdctrl->fifo, -BDRV_SECTOR_SIZE ,0 ) <0 ) { +if (blk_pwrite (cur_drv->blk,fd_offset (cur_drv),BDRV_SECTOR_SIZE , + fdctrl->fifo,0 ) <0 ) {FLOPPY_DPRINTF ("error writing sector %d\n" ,fd_sector (cur_drv));break ;
hw/block/hd-geometry.c +1 -1
@@ -63,7 +63,7 @@ static int guess_disk_lchs(BlockBackend *blk,blk_get_geometry (blk, &nb_sectors); -if (blk_pread (blk,0 , buf,BDRV_SECTOR_SIZE ,0 ) <0 ) { +if (blk_pread (blk,0 ,BDRV_SECTOR_SIZE , buf,0 ) <0 ) {return -1 ; }/* test msdos magic */
hw/block/m25p80.c +1 -1
@@ -1506,7 +1506,7 @@ static void m25p80_realize(SSIPeripheral *ss, Error **errp)trace_m25p80_binding (s); s->storage =blk_blockalign (s->blk, s->size); -if (blk_pread (s->blk,0 , s->storage, s->size,0 ) <0 ) { +if (blk_pread (s->blk,0 , s->size, s->storage,0 ) <0 ) {error_setg (errp,"failed to read the initial flash content" );return ; }
hw/block/nand.c +24 -23
112 lines not on this page · raw message
hw/block/onenand.c +16 -16
@@ -229,8 +229,8 @@ static void onenand_reset(OneNANDState *s, int cold)/* Lock the whole flash */ memset (s->blockwp,ONEN_LOCK_LOCKED , s->blocks); -if (s->blk_cur &&blk_pread (s->blk_cur,0 , s->boot[0 ], -8 <<BDRV_SECTOR_BITS ,0 ) <0 ) { +if (s->blk_cur &&blk_pread (s->blk_cur,0 ,8 <<BDRV_SECTOR_BITS , + s->boot[0 ],0 ) <0 ) {hw_error ("%s: Loading the BootRAM failed.\n" , __func__); } }
@@ -249,8 +249,8 @@ static inline int onenand_load_main(OneNANDState *s, int sec, int secn,assert (UINT32_MAX >>BDRV_SECTOR_BITS > sec);assert (UINT32_MAX >>BDRV_SECTOR_BITS > secn);if (s->blk_cur) { -return blk_pread (s->blk_cur, sec <<BDRV_SECTOR_BITS , dest, - secn <<BDRV_SECTOR_BITS ,0 ) <0 ; +return blk_pread (s->blk_cur, sec <<BDRV_SECTOR_BITS , + secn <<BDRV_SECTOR_BITS , dest,0 ) <0 ; }else if (sec + secn > s->secs_cur) {return 1 ; }
@@ -274,7 +274,7 @@ static inline int onenand_prog_main(OneNANDState *s, int sec, int secn,uint8_t *dp =0 ;if (s->blk_cur) { dp =g_malloc (size); -if (!dp ||blk_pread (s->blk_cur, offset, dp, size,0 ) <0 ) { +if (!dp ||blk_pread (s->blk_cur, offset, size, dp,0 ) <0 ) { result =1 ; } }else {
@@ -290,7 +290,7 @@ static inline int onenand_prog_main(OneNANDState *s, int sec, int secn, dp[i] &= sp[i]; }if (s->blk_cur) { - result =blk_pwrite (s->blk_cur, offset, dp, size,0 ) <0 ; + result =blk_pwrite (s->blk_cur, offset, size, dp,0 ) <0 ; } }if (dp && s->blk_cur) {
@@ -308,7 +308,7 @@ static inline int onenand_load_spare(OneNANDState *s, int sec, int secn,if (s->blk_cur) {uint32_t offset = (s->secs_cur + (sec >>5 )) <<BDRV_SECTOR_BITS ; -if (blk_pread (s->blk_cur, offset, buf,BDRV_SECTOR_SIZE ,0 ) <0 ) { +if (blk_pread (s->blk_cur, offset,BDRV_SECTOR_SIZE , buf,0 ) <0 ) {return 1 ; }memcpy (dest, buf + ((sec &31 ) <<4 ), secn <<4 );
@@ -333,7 +333,7 @@ static inline int onenand_prog_spare(OneNANDState *s, int sec, int secn,if (s->blk_cur) { dp =g_malloc (512 );if (!dp - ||blk_pread (s->blk_cur, offset, dp,BDRV_SECTOR_SIZE ,0 ) <0 ) { + ||blk_pread (s->blk_cur, offset,BDRV_SECTOR_SIZE , dp,0 ) <0 ) { result =1 ; }else { dpp = dp + ((sec &31 ) <<4 );
@@ -351,8 +351,8 @@ static inline int onenand_prog_spare(OneNANDState *s, int sec, int secn, dpp[i] &= sp[i]; }if (s->blk_cur) { - result =blk_pwrite (s->blk_cur, offset, dp, -BDRV_SECTOR_SIZE ,0 ) <0 ; + result =blk_pwrite (s->blk_cur, offset,BDRV_SECTOR_SIZE , dp, +0 ) <0 ; } }g_free (dp);
@@ -370,17 +370,17 @@ static inline int onenand_erase(OneNANDState *s, int sec, int num)for (; num >0 ; num--, sec++) {if (s->blk_cur) {int erasesec = s->secs_cur + (sec >>5 ); -if (blk_pwrite (s->blk_cur, sec <<BDRV_SECTOR_BITS , blankbuf, -BDRV_SECTOR_SIZE ,0 ) <0 ) { +if (blk_pwrite (s->blk_cur, sec <<BDRV_SECTOR_BITS , +BDRV_SECTOR_SIZE , blankbuf,0 ) <0 ) { goto fail; } -if (blk_pread (s->blk_cur, erasesec <<BDRV_SECTOR_BITS , tmpbuf, -BDRV_SECTOR_SIZE ,0 ) <0 ) { +if (blk_pread (s->blk_cur, erasesec <<BDRV_SECTOR_BITS , +BDRV_SECTOR_SIZE , tmpbuf,0 ) <0 ) { goto fail; }memcpy (tmpbuf + ((sec &31 ) <<4 ), blankbuf,1 <<4 ); -if (blk_pwrite (s->blk_cur, erasesec <<BDRV_SECTOR_BITS , tmpbuf, -BDRV_SECTOR_SIZE ,0 ) <0 ) { +if (blk_pwrite (s->blk_cur, erasesec <<BDRV_SECTOR_BITS , +BDRV_SECTOR_SIZE , tmpbuf,0 ) <0 ) { goto fail; } }else {
hw/block/pflash_cfi01.c +2 -2
@@ -392,8 +392,8 @@ static void pflash_update(PFlashCFI01 *pfl, int offset,/* widen to sector boundaries */ offset =QEMU_ALIGN_DOWN (offset,BDRV_SECTOR_SIZE ); offset_end =QEMU_ALIGN_UP (offset_end,BDRV_SECTOR_SIZE ); - ret =blk_pwrite (pfl->blk, offset, pfl->storage + offset, - offset_end - offset,0 ); + ret =blk_pwrite (pfl->blk, offset, offset_end - offset, + pfl->storage + offset,0 );if (ret <0 ) {/* TODO set error bit in status */ error_report ("Could not update PFLASH: %s" ,strerror (-ret));
hw/block/pflash_cfi02.c +2 -2
@@ -400,8 +400,8 @@ static void pflash_update(PFlashCFI02 *pfl, int offset, int size)/* widen to sector boundaries */ offset =QEMU_ALIGN_DOWN (offset,BDRV_SECTOR_SIZE ); offset_end =QEMU_ALIGN_UP (offset_end,BDRV_SECTOR_SIZE ); - ret =blk_pwrite (pfl->blk, offset, pfl->storage + offset, - offset_end - offset,0 ); + ret =blk_pwrite (pfl->blk, offset, offset_end - offset, + pfl->storage + offset,0 );if (ret <0 ) {/* TODO set error bit in status */ error_report ("Could not update PFLASH: %s" ,strerror (-ret));
hw/ide/atapi.c +2 -2
@@ -98,11 +98,11 @@ cd_read_sector_sync(IDEState *s)switch (s->cd_sector_size) {case 2048 : ret =blk_pread (s->blk, (int64_t )s->lba <<ATAPI_SECTOR_BITS , - s->io_buffer,ATAPI_SECTOR_SIZE ,0 ); +ATAPI_SECTOR_SIZE , s->io_buffer,0 );break ;case 2352 : ret =blk_pread (s->blk, (int64_t )s->lba <<ATAPI_SECTOR_BITS , - s->io_buffer +16 ,ATAPI_SECTOR_SIZE ,0 ); +ATAPI_SECTOR_SIZE , s->io_buffer +16 ,0 );if (ret >=0 ) {cd_data_to_raw (s->io_buffer, s->lba); }
hw/misc/mac_via.c +2 -2
@@ -351,7 +351,7 @@ static void via1_one_second(void *opaque)static void pram_update (MOS6522Q800VIA1State *v1s) {if (v1s->blk) { -if (blk_pwrite (v1s->blk,0 , v1s->PRAM,sizeof (v1s->PRAM),0 ) <0 ) { +if (blk_pwrite (v1s->blk,0 ,sizeof (v1s->PRAM), v1s->PRAM,0 ) <0 ) {qemu_log ("pram_update: cannot write to file\n" ); } }
@@ -1029,7 +1029,7 @@ static void mos6522_q800_via1_realize(DeviceState *dev, Error **errp)return ; } - len =blk_pread (v1s->blk,0 , v1s->PRAM,sizeof (v1s->PRAM),0 ); + len =blk_pread (v1s->blk,0 ,sizeof (v1s->PRAM), v1s->PRAM,0 );if (len <0 ) {error_setg (errp,"can't read PRAM contents" );return ;
hw/misc/sifive_u_otp.c +7 -7
@@ -64,8 +64,8 @@ static uint64_t sifive_u_otp_read(void *opaque, hwaddr addr, unsigned int size)if (s->blk) {int32_t buf; -if (blk_pread (s->blk, s->pa *SIFIVE_U_OTP_FUSE_WORD , &buf, -SIFIVE_U_OTP_FUSE_WORD ,0 ) <0 ) { +if (blk_pread (s->blk, s->pa *SIFIVE_U_OTP_FUSE_WORD , +SIFIVE_U_OTP_FUSE_WORD , &buf,0 ) <0 ) {error_report ("read error index<%d>" , s->pa);return 0xff ; }
@@ -167,8 +167,8 @@ static void sifive_u_otp_write(void *opaque, hwaddr addr,/* write to backend */ if (s->blk) {if (blk_pwrite (s->blk, s->pa *SIFIVE_U_OTP_FUSE_WORD , - &s->fuse[s->pa],SIFIVE_U_OTP_FUSE_WORD , -0 ) <0 ) { +SIFIVE_U_OTP_FUSE_WORD , &s->fuse[s->pa],0 ) + <0 ) {error_report ("write error index<%d>" , s->pa); } }
@@ -240,7 +240,7 @@ static void sifive_u_otp_realize(DeviceState *dev, Error **errp)return ; } -if (blk_pread (s->blk,0 , s->fuse, filesize,0 ) <0 ) { +if (blk_pread (s->blk,0 , filesize, s->fuse,0 ) <0 ) {error_setg (errp,"failed to read the initial flash content" );return ; }
@@ -261,14 +261,14 @@ static void sifive_u_otp_realize(DeviceState *dev, Error **errp) serial_data = s->serial;if (blk_pwrite (s->blk, index *SIFIVE_U_OTP_FUSE_WORD , - &serial_data,SIFIVE_U_OTP_FUSE_WORD ,0 ) <0 ) { +SIFIVE_U_OTP_FUSE_WORD , &serial_data,0 ) <0 ) {error_setg (errp,"failed to write index<%d>" , index);return ; } serial_data = ~(s->serial);if (blk_pwrite (s->blk, (index +1 ) *SIFIVE_U_OTP_FUSE_WORD , - &serial_data,SIFIVE_U_OTP_FUSE_WORD ,0 ) <0 ) { +SIFIVE_U_OTP_FUSE_WORD , &serial_data,0 ) <0 ) {error_setg (errp,"failed to write index<%d>" , index +1 );return ; }
hw/nvram/eeprom_at24c.c +2 -2
@@ -64,7 +64,7 @@ int at24c_eeprom_event(I2CSlave *s, enum i2c_event event)case I2C_START_RECV :DPRINTK ("clear\n" );if (ee->blk && ee->changed) { -int len =blk_pwrite (ee->blk,0 , ee->mem, ee->rsize,0 ); +int len =blk_pwrite (ee->blk,0 , ee->rsize, ee->mem,0 );if (len <0 ) {ERR (TYPE_AT24C_EE " : failed to write backing file\n" );
@@ -163,7 +163,7 @@ void at24c_eeprom_reset(DeviceState *state)memset (ee->mem,0 , ee->rsize);if (ee->blk) { -int len =blk_pread (ee->blk,0 , ee->mem, ee->rsize,0 ); +int len =blk_pread (ee->blk,0 , ee->rsize, ee->mem,0 );if (len <0 ) { ERR(TYPE_AT24C_EE
hw/nvram/spapr_nvram.c +3 -3
@@ -130,7 +130,7 @@ static void rtas_nvram_store(PowerPCCPU *cpu, SpaprMachineState *spapr, ret =0 ;if (nvram->blk) { - ret =blk_pwrite (nvram->blk, offset, membuf, len,0 ); + ret =blk_pwrite (nvram->blk, offset, len, membuf,0 ); }assert (nvram->buf);
@@ -179,7 +179,7 @@ static void spapr_nvram_realize(SpaprVioDevice *dev, Error **errp) }if (nvram->blk) { -int alen =blk_pread (nvram->blk,0 , nvram->buf, nvram->size,0 ); +int alen =blk_pread (nvram->blk,0 , nvram->size, nvram->buf,0 );if (alen <0 ) {error_setg (errp,"can't read spapr-nvram contents" );
@@ -224,7 +224,7 @@ static void postload_update_cb(void *opaque, bool running, RunState state)qemu_del_vm_change_state_handler (nvram->vmstate); nvram->vmstate =NULL ; -blk_pwrite (nvram->blk,0 , nvram->buf, nvram->size,0 ); +blk_pwrite (nvram->blk,0 , nvram->size, nvram->buf,0 ); }static int spapr_nvram_post_load (void *opaque,int version_id)
hw/nvram/xlnx-bbram.c +2 -2
@@ -124,7 +124,7 @@ static void bbram_bdrv_read(XlnxBBRam *s, Error **errp) blk_name(s->blk)); } -if (blk_pread (s->blk,0 , ram, nr,0 ) <0 ) { +if (blk_pread (s->blk,0 , nr, ram,0 ) <0 ) {error_setg (errp,"%s: Failed to read %u bytes from BBRAM backstore." ,blk_name (s->blk), nr);
@@ -159,7 +159,7 @@ static void bbram_bdrv_sync(XlnxBBRam *s, uint64_t hwaddr) } offset = hwaddr -A_BBRAM_0 ; - rc =blk_pwrite (s->blk, offset, &le32,4 ,0 ); + rc =blk_pwrite (s->blk, offset,4 , &le32,0 );if (rc <0 ) {bbram_bdrv_error (s, rc,g_strdup_printf ("write to offset %u" , offset)); }
hw/nvram/xlnx-efuse.c +2 -2
@@ -77,7 +77,7 @@ static int efuse_bdrv_read(XlnxEFuse *s, Error **errp) blk_name(s->blk)); } -if (blk_pread (s->blk,0 , ram, nr,0 ) <0 ) { +if (blk_pread (s->blk,0 , nr, ram,0 ) <0 ) {error_setg (errp,"%s: Failed to read %u bytes from eFUSE backstore." ,blk_name (s->blk), nr);return -1 ;
@@ -105,7 +105,7 @@ static void efuse_bdrv_sync(XlnxEFuse *s, unsigned int bit) le32 =cpu_to_le32 (xlnx_efuse_get_row (s, bit)); row_offset = (bit /32 ) *4 ; -if (blk_pwrite (s->blk, row_offset, &le32,4 ,0 ) <0 ) { +if (blk_pwrite (s->blk, row_offset,4 , &le32,0 ) <0 ) {error_report ("%s: Failed to write offset %u of eFUSE backstore." ,blk_name (s->blk), row_offset); }
hw/ppc/pnv_pnor.c +3 -3
@@ -44,8 +44,8 @@ static void pnv_pnor_update(PnvPnor *s, int offset, int size) offset =QEMU_ALIGN_DOWN (offset,BDRV_SECTOR_SIZE ); offset_end =QEMU_ALIGN_UP (offset_end,BDRV_SECTOR_SIZE ); - ret =blk_pwrite (s->blk, offset, s->storage + offset, - offset_end - offset,0 ); + ret =blk_pwrite (s->blk, offset, offset_end - offset, s->storage + offset, +0 );if (ret <0 ) {error_report ("Could not update PNOR offset=0x%" PRIx32" : %s" , offset,strerror (-ret));
@@ -99,7 +99,7 @@ static void pnv_pnor_realize(DeviceState *dev, Error **errp) s->storage =blk_blockalign (s->blk, s->size); -if (blk_pread (s->blk,0 , s->storage, s->size,0 ) <0 ) { +if (blk_pread (s->blk,0 , s->size, s->storage,0 ) <0 ) {error_setg (errp,"failed to read the initial flash content" );return ; }
hw/sd/sd.c +2 -2
@@ -752,7 +752,7 @@ void sd_set_cb(SDState *sd, qemu_irq readonly, qemu_irq insert)static void sd_blk_read (SDState *sd,uint64_t addr,uint32_t len) {trace_sdcard_read_block (addr, len); -if (!sd->blk ||blk_pread (sd->blk, addr, sd->data, len,0 ) <0 ) { +if (!sd->blk ||blk_pread (sd->blk, addr, len, sd->data,0 ) <0 ) {fprintf (stderr,"sd_blk_read: read error on host side\n" ); } }
@@ -760,7 +760,7 @@ static void sd_blk_read(SDState *sd, uint64_t addr, uint32_t len)static void sd_blk_write (SDState *sd,uint64_t addr,uint32_t len) {trace_sdcard_write_block (addr, len); -if (!sd->blk ||blk_pwrite (sd->blk, addr, sd->data, len,0 ) <0 ) { +if (!sd->blk ||blk_pwrite (sd->blk, addr, len, sd->data,0 ) <0 ) {fprintf (stderr,"sd_blk_write: write error on host side\n" ); } }
include/sysemu/block-backend-io.h +2 -2
@@ -102,9 +102,9 @@ int coroutine_fn blk_co_copy_range(BlockBackend *blk_in, int64_t off_in,* the "I/O or GS" API. */ -int blk_pread (BlockBackend *blk,int64_t offset,void *buf,int bytes, +int blk_pread (BlockBackend *blk,int64_t offset,int bytes,void *buf,BdrvRequestFlags flags); -int blk_pwrite (BlockBackend *blk,int64_t offset,const void *buf,int bytes, +int blk_pwrite (BlockBackend *blk,int64_t offset,int bytes,const void *buf,BdrvRequestFlags flags); int coroutine_fn blk_co_preadv(BlockBackend *blk, int64_t offset, int64_t bytes, QEMUIOVector *qiov,
migration/block.c +3 -3
@@ -569,7 +569,7 @@ static int mig_save_device_dirty(QEMUFile *f, BlkMigDevState *bmds,blk_mig_unlock (); }else { ret =blk_pread (bmds->blk, sector *BDRV_SECTOR_SIZE , - blk->buf, nr_sectors *BDRV_SECTOR_SIZE ,0 ); + nr_sectors *BDRV_SECTOR_SIZE , blk->buf,0 );if (ret <0 ) { goto error; }
@@ -976,8 +976,8 @@ static int block_load(QEMUFile *f, void *opaque, int version_id) cluster_size, BDRV_REQ_MAY_UNMAP); }else { - ret =blk_pwrite (blk, cur_addr, cur_buf, - cluster_size,0 ); + ret =blk_pwrite (blk, cur_addr, cluster_size, cur_buf, +0 ); }if (ret <0 ) {break ;
nbd/server.c +4 -4
@@ -2039,8 +2039,8 @@ static int coroutine_fn nbd_co_send_sparse_read(NBDClient *client,stl_be_p (&chunk.length, pnum); ret =nbd_co_send_iov (client, iov,1 , errp); }else { - ret =blk_pread (exp->common.blk, offset + progress, - data + progress, pnum,0 ); + ret =blk_pread (exp->common.blk, offset + progress, pnum, + data + progress,0 );if (ret <0 ) {error_setg_errno (errp, -ret,"reading from file failed" );break ;
@@ -2444,7 +2444,7 @@ static coroutine_fn int nbd_do_cmd_read(NBDClient *client, NBDRequest *request, data, request->len, errp); } - ret =blk_pread (exp->common.blk, request->from, data, request->len,0 ); + ret =blk_pread (exp->common.blk, request->from, request->len, data,0 );if (ret <0 ) {return nbd_send_generic_reply (client, request->handle, ret,"reading from file failed" , errp);
@@ -2511,7 +2511,7 @@ static coroutine_fn int nbd_handle_request(NBDClient *client,if (request->flags &NBD_CMD_FLAG_FUA ) { flags |=BDRV_REQ_FUA ; } - ret =blk_pwrite (exp->common.blk, request->from, data, request->len, + ret =blk_pwrite (exp->common.blk, request->from, request->len, data, flags);return nbd_send_generic_reply (client, request->handle, ret,"writing to file failed" , errp);
qemu-img.c +9 -9
@@ -1309,7 +1309,7 @@ static int check_empty_sectors(BlockBackend *blk, int64_t offset,int ret =0 ;int64_t idx; - ret =blk_pread (blk, offset, buffer, bytes,0 ); + ret =blk_pread (blk, offset, bytes, buffer,0 );if (ret <0 ) {error_report ("Error while reading offset %" PRId64" of %s: %s" , offset, filename,strerror (-ret));
@@ -1526,7 +1526,7 @@ static int img_compare(int argc, char **argv)int64_t pnum; chunk =MIN (chunk,IO_BUF_SIZE ); - ret =blk_pread (blk1, offset, buf1, chunk,0 ); + ret =blk_pread (blk1, offset, chunk, buf1,0 );if (ret <0 ) { error_report("Error while reading offset %" PRId64 " of %s: %s",
@@ -1534,7 +1534,7 @@ static int img_compare(int argc, char **argv) ret =4 ; goto out; } - ret =blk_pread (blk2, offset, buf2, chunk,0 ); + ret =blk_pread (blk2, offset, chunk, buf2,0 );if (ret <0 ) { error_report("Error while reading offset %" PRId64 " of %s: %s",
@@ -3779,7 +3779,7 @@ static int img_rebase(int argc, char **argv) n = old_backing_size - offset; } - ret =blk_pread (blk_old_backing, offset, buf_old, n,0 ); + ret =blk_pread (blk_old_backing, offset, n, buf_old,0 );if (ret <0 ) {error_report ("error while reading from old backing file" ); goto out;
@@ -3793,7 +3793,7 @@ static int img_rebase(int argc, char **argv) n = new_backing_size - offset; } - ret =blk_pread (blk_new_backing, offset, buf_new, n,0 ); + ret =blk_pread (blk_new_backing, offset, n, buf_new,0 );if (ret <0 ) {error_report ("error while reading from new backing file" ); goto out;
@@ -3812,8 +3812,8 @@ static int img_rebase(int argc, char **argv)if (buf_old_is_zero) { ret =blk_pwrite_zeroes (blk, offset + written, pnum,0 ); }else { - ret =blk_pwrite (blk, offset + written, - buf_old + written, pnum,0 ); + ret =blk_pwrite (blk, offset + written, pnum, + buf_old + written,0 ); }if (ret <0 ) { error_report("Error while writing to COW image: %s",
@@ -5124,7 +5124,7 @@ static int img_dd(int argc, char **argv) bytes = (in_pos + in.bsz > size) ? size - in_pos : in.bsz; - in_ret =blk_pread (blk1, in_pos, in.buf, bytes,0 ); + in_ret =blk_pread (blk1, in_pos, bytes, in.buf,0 );if (in_ret <0 ) {error_report ("error while reading from input image file: %s" ,strerror (-in_ret));
@@ -5133,7 +5133,7 @@ static int img_dd(int argc, char **argv) } in_pos += bytes; - out_ret =blk_pwrite (blk2, out_pos, in.buf, bytes,0 ); + out_ret =blk_pwrite (blk2, out_pos, bytes, in.buf,0 );if (out_ret <0 ) {error_report ("error while writing to output image file: %s" ,strerror (-out_ret));
qemu-io-cmds.c +2 -2
@@ -547,7 +547,7 @@ static int do_pread(BlockBackend *blk, char *buf, int64_t offset,return -ERANGE ; } - ret =blk_pread (blk, offset, (uint8_t *)buf, bytes,0 ); + ret =blk_pread (blk, offset, bytes, (uint8_t *)buf,0 );if (ret <0 ) {return ret; }
@@ -564,7 +564,7 @@ static int do_pwrite(BlockBackend *blk, char *buf, int64_t offset,return -ERANGE ; } - ret =blk_pwrite (blk, offset, (uint8_t *)buf, bytes, flags); + ret =blk_pwrite (blk, offset, bytes, (uint8_t *)buf, flags);if (ret <0 ) {return ret; }
tests/unit/test-block-iothread.c +4 -4
@@ -116,11 +116,11 @@ static void test_sync_op_blk_pread(BlockBackend *blk)int ret;/* Success */ - ret =blk_pread (blk,0 , buf,sizeof (buf),0 ); + ret =blk_pread (blk,0 ,sizeof (buf), buf,0 ); g_assert_cmpint(ret, ==, 0);/* Early error: Negative offset */ - ret =blk_pread (blk,-2 , buf,sizeof (buf),0 ); + ret =blk_pread (blk,-2 ,sizeof (buf), buf,0 ); g_assert_cmpint(ret, ==, -EIO); }
@@ -130,11 +130,11 @@ static void test_sync_op_blk_pwrite(BlockBackend *blk)int ret;/* Success */ - ret =blk_pwrite (blk,0 , buf,sizeof (buf),0 ); + ret =blk_pwrite (blk,0 ,sizeof (buf), buf,0 ); g_assert_cmpint(ret, ==, 0);/* Early error: Negative offset */ - ret =blk_pwrite (blk,-2 , buf,sizeof (buf),0 ); + ret =blk_pwrite (blk,-2 ,sizeof (buf), buf,0 ); g_assert_cmpint(ret, ==, -EIO); }
Signature · 1 line
2.35.3
Re: [PATCH 03/18] block: Change blk_{pread,pwrite}() param order
Quoted 14 lines · Alberto Faria
Swap 'buf' and 'bytes' around for consistency with blk_co_{pread,pwrite}(), and in preparation to implement these functions using
generated_co_wrapper.Callers were updated using this Coccinelle script:
@@ expression blk, offset, buf, bytes, flags; @@
-blk_pread(blk, offset, buf, bytes, flags)
+blk_pread(blk, offset, bytes, buf, flags)@@ expression blk, offset, buf, bytes, flags; @@
-blk_pwrite(blk, offset, buf, bytes, flags)
+blk_pwrite(blk, offset, bytes, buf, flags)
Quoted 7 lines
It had no effect on
hw/block/nand.c, presumably due to the #if, so that file was updated manually.Overly-long lines were then fixed by hand.
Signed-off-by Alberto Faria <[email protected]>---
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org
Re: [PATCH 03/18] block: Change blk_{pread,pwrite}() param order
In reply to Alberto FariaQuoted 52 lines · Alberto Faria
Swap 'buf' and 'bytes' around for consistency with blk_co_{pread,pwrite}(), and in preparation to implement these functions using
generated_co_wrapper.Callers were updated using this Coccinelle script:
@@ expression blk, offset, buf, bytes, flags; @@
-blk_pread(blk, offset, buf, bytes, flags)
+blk_pread(blk, offset, bytes, buf, flags)@@ expression blk, offset, buf, bytes, flags; @@
-blk_pwrite(blk, offset, buf, bytes, flags)
+blk_pwrite(blk, offset, bytes, buf, flags)It had no effect on
hw/block/nand.c, presumably due to the #if, so that file was updated manually.Overly-long lines were then fixed by hand.
Signed-off-by Alberto Faria <[email protected]>--- block.c | 2 +- block/block-backend.c | 4 +-- block/commit.c | 4 +-- block/crypto.c | 2 +- block/export/fuse.c | 4 +-- block/parallels.c | 2 +- block/qcow.c | 8 +++--- block/qcow2.c | 4 +-- block/qed.c | 8 +++--- block/vdi.c | 4 +-- block/vhdx.c | 20 ++++++------- block/vmdk.c | 10 +++---- block/vpc.c | 12 ++++---- hw/arm/allwinner-h3.c | 2 +- hw/arm/aspeed.c | 2 +- hw/block/block.c | 2 +- hw/block/fdc.c | 20 ++++++------- hw/block/hd-geometry.c | 2 +- hw/block/m25p80.c | 2 +- hw/block/nand.c | 47 ++++++++++++++++--------------- hw/block/onenand.c | 32 ++++++++++----------- hw/block/pflash_cfi01.c | 4 +-- hw/block/pflash_cfi02.c | 4 +-- hw/ide/atapi.c | 4 +-- hw/misc/mac_via.c | 4 +-- hw/misc/sifive_u_otp.c | 14 ++++----- hw/nvram/eeprom_at24c.c | 4 +-- hw/nvram/spapr_nvram.c | 6 ++-- hw/nvram/xlnx-bbram.c | 4 +-- hw/nvram/xlnx-efuse.c | 4 +-- hw/ppc/pnv_pnor.c | 6 ++--
Quoted 8 lines
hw/sd/sd.c | 4 +-- include/sysemu/block-backend-io.h | 4 +-- migration/block.c | 6 ++-- nbd/server.c | 8 +++--- qemu-img.c | 18 ++++++------ qemu-io-cmds.c | 4 +-- tests/unit/test-block-iothread.c | 8 +++--- 38 files changed, 150 insertions(+), 149 deletions(-)
PATCH 4/18 block: Make 'bytes' param of blk_{pread, pwrite}() an int64_t
In reply to Alberto FariaFor consistency with other I/O functions, and in preparation to implement them using generated_co_wrapper.
--- block/block-backend.c | 6 +++--- include/sysemu/block-backend-io.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-)
block/block-backend.c +3 -3
@@ -1567,7 +1567,7 @@ BlockAIOCB *blk_aio_pwrite_zeroes(BlockBackend *blk, int64_t offset, flags | BDRV_REQ_ZERO_WRITE, cb, opaque); } -int blk_pread (BlockBackend *blk,int64_t offset,int bytes,void *buf, +int blk_pread (BlockBackend *blk,int64_t offset,int64_t bytes,void *buf,BdrvRequestFlags flags) {int ret;
@@ -1581,8 +1581,8 @@ int blk_pread(BlockBackend *blk, int64_t offset, int bytes, void *buf,return ret; } -int blk_pwrite (BlockBackend *blk,int64_t offset,int bytes,const void *buf, -BdrvRequestFlags flags) +int blk_pwrite (BlockBackend *blk,int64_t offset,int64_t bytes, +const void *buf,BdrvRequestFlags flags) {QEMUIOVector qiov =QEMU_IOVEC_INIT_BUF (qiov, buf, bytes);IO_OR_GS_CODE ();
include/sysemu/block-backend-io.h +3 -3
@@ -102,10 +102,10 @@ int coroutine_fn blk_co_copy_range(BlockBackend *blk_in, int64_t off_in,* the "I/O or GS" API. */ -int blk_pread (BlockBackend *blk,int64_t offset,int bytes,void *buf, +int blk_pread (BlockBackend *blk,int64_t offset,int64_t bytes,void *buf,BdrvRequestFlags flags); -int blk_pwrite (BlockBackend *blk,int64_t offset,int bytes,const void *buf, -BdrvRequestFlags flags); +int blk_pwrite (BlockBackend *blk,int64_t offset,int64_t bytes, +const void *buf,BdrvRequestFlags flags); int coroutine_fn blk_co_preadv(BlockBackend *blk, int64_t offset,int64_t bytes,QEMUIOVector *qiov,BdrvRequestFlags flags);
Signature · 1 line
2.35.3
Re: [PATCH 04/18] block: Make 'bytes' param of blk_{pread, pwrite}() an int64_t
Quoted 8 lines · Alberto Faria
For consistency with other I/O functions, and in preparation to implement them using
generated_co_wrapper.Signed-off-by Alberto Faria <[email protected]>--- block/block-backend.c | 6 +++--- include/sysemu/block-backend-io.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-)
Re: [PATCH 04/18] block: Make 'bytes' param of blk_{pread,pwrite}() an int64_t
In reply to Alberto FariaQuoted 8 lines · Alberto Faria
For consistency with other I/O functions, and in preparation to implement them using
generated_co_wrapper.Signed-off-by Alberto Faria <[email protected]>--- block/block-backend.c | 6 +++--- include/sysemu/block-backend-io.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-)
PATCH 5/18 block: Make blk_co_pwrite() take a const buffer
In reply to Alberto FariaIt does not mutate the buffer.
--- include/sysemu/block-backend-io.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/sysemu/block-backend-io.h +1 -1
@@ -130,7 +130,7 @@ static inline int coroutine_fn blk_co_pread(BlockBackend *blk, int64_t offset, } static inline int coroutine_fn blk_co_pwrite(BlockBackend *blk, int64_t offset, -int64_t bytes,void *buf, +int64_t bytes,const void *buf,BdrvRequestFlags flags) {QEMUIOVector qiov =QEMU_IOVEC_INIT_BUF (qiov, buf, bytes);
Signature · 1 line
2.35.3
Re: [PATCH 05/18] block: Make blk_co_pwrite() take a const buffer
Quoted 6 lines · Alberto Faria
It does not mutate the buffer.
Signed-off-by Alberto Faria <[email protected]>--- include/sysemu/block-backend-io.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 13 lines
include/sysemu/block-backend-io.h +1
-1@@ -130,7 +130,7 @@ static inline int coroutine_fn blk_co_pread(BlockBackend *blk, int64_t offset, } static inline int coroutine_fn blk_co_pwrite(BlockBackend *blk, int64_t offset, -int64_t bytes,void *buf, +int64_t bytes,const void *buf,BdrvRequestFlags flags) {QEMUIOVector qiov =QEMU_IOVEC_INIT_BUF (qiov, buf, bytes);
Re: [PATCH 05/18] block: Make blk_co_pwrite() take a const buffer
In reply to Alberto FariaQuoted 6 lines · Alberto Faria
It does not mutate the buffer.
Signed-off-by Alberto Faria <[email protected]>--- include/sysemu/block-backend-io.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
PATCH 6/18 block: Implement blk_{pread, pwrite}() using generated_co_wrapper
In reply to Alberto FariaWe need to add include/sysemu/block-backend-io.h to the inputs of the block-gen.c target defined in block/meson.build.
--- block/block-backend.c | 23 ----------------------- block/coroutines.h | 4 ---- block/meson.build | 1 + include/sysemu/block-backend-io.h | 10 ++++++---- 4 files changed, 7 insertions(+), 31 deletions(-)
block/block-backend.c +0 -23
@@ -1567,29 +1567,6 @@ BlockAIOCB *blk_aio_pwrite_zeroes(BlockBackend *blk, int64_t offset, flags | BDRV_REQ_ZERO_WRITE, cb, opaque); } -int blk_pread (BlockBackend *blk,int64_t offset,int64_t bytes,void *buf, -BdrvRequestFlags flags) -{ -int ret; -QEMUIOVector qiov =QEMU_IOVEC_INIT_BUF (qiov, buf, bytes); -IO_OR_GS_CODE (); - -blk_inc_in_flight (blk); - ret =blk_do_preadv (blk, offset, bytes, &qiov, flags); -blk_dec_in_flight (blk); - -return ret; -} - -int blk_pwrite (BlockBackend *blk,int64_t offset,int64_t bytes, -const void *buf,BdrvRequestFlags flags) -{ -QEMUIOVector qiov =QEMU_IOVEC_INIT_BUF (qiov, buf, bytes); -IO_OR_GS_CODE (); - -return blk_pwritev_part (blk, offset, bytes, &qiov,0 , flags); -} -int64_t blk_getlength (BlockBackend *blk) {IO_CODE ();
block/coroutines.h +0 -4
@@ -112,10 +112,6 @@ bdrv_common_block_status_above(BlockDriverState *bs, int generated_co_wrappernbd_do_establish_connection (BlockDriverState *bs,bool blocking,Error **errp); -int generated_co_wrapper -blk_do_preadv (BlockBackend *blk,int64_t offset,int64_t bytes, -QEMUIOVector *qiov,BdrvRequestFlags flags); - int generated_co_wrapper blk_do_pwritev_part(BlockBackend *blk, int64_t offset, int64_t bytes, QEMUIOVector *qiov, size_t qiov_offset,
block/meson.build +1 -0
@@ -136,6 +136,7 @@ block_gen_c = custom_target('block-gen.c', input: files( '../include/block/block-io.h', '../include/block/block-global-state.h', + '../include/sysemu/block-backend-io.h', 'coroutines.h' ), command: [wrapper_py, '@OUTPUT@', '@INPUT@'])
include/sysemu/block-backend-io.h +6 -4
@@ -102,10 +102,12 @@ int coroutine_fn blk_co_copy_range(BlockBackend *blk_in, int64_t off_in,* the "I/O or GS" API. */ -int blk_pread (BlockBackend *blk,int64_t offset,int64_t bytes,void *buf, -BdrvRequestFlags flags); -int blk_pwrite (BlockBackend *blk,int64_t offset,int64_t bytes, -const void *buf,BdrvRequestFlags flags); +int generated_co_wrapper blk_pread(BlockBackend *blk, int64_t offset, +int64_t bytes,void *buf, +BdrvRequestFlags flags); +int generated_co_wrapper blk_pwrite(BlockBackend *blk, int64_t offset, +int64_t bytes,const void *buf, +BdrvRequestFlags flags); int coroutine_fn blk_co_preadv(BlockBackend *blk, int64_t offset,int64_t bytes,QEMUIOVector *qiov,BdrvRequestFlags flags);
Signature · 1 line
2.35.3
Re: [PATCH 06/18] block: Implement blk_{pread, pwrite}() using generated_co_wrapper
Quoted 4 lines · Alberto Faria
We need to add
include/sysemu/block-backend-io.hto the inputs of theblock-gen.ctarget defined inblock/meson.build.Signed-off-by Alberto Faria <[email protected]>
Emanuele is looking it cleaning this up, so you two need to coordinate.
Emanuele, can you separate/post the initial patches to clean up the includes of block/coroutines.h and block/block-gen.c?
Apart from that, fewer block/coroutines.h declarations is only good stuff.
Thanks,
Paolo
Quoted 89 lines
--- block/block-backend.c | 23 ----------------------- block/coroutines.h | 4 ---- block/meson.build | 1 + include/sysemu/block-backend-io.h | 10 ++++++---- 4 files changed, 7 insertions(+), 31 deletions(-)block/block-backend.c +0
-23@@ -1567,29 +1567,6 @@ BlockAIOCB *blk_aio_pwrite_zeroes(BlockBackend *blk, int64_t offset, flags | BDRV_REQ_ZERO_WRITE, cb, opaque); } -int blk_pread (BlockBackend *blk,int64_t offset,int64_t bytes,void *buf, -BdrvRequestFlags flags) -{ -int ret; -QEMUIOVector qiov =QEMU_IOVEC_INIT_BUF (qiov, buf, bytes); -IO_OR_GS_CODE (); - -blk_inc_in_flight (blk); - ret =blk_do_preadv (blk, offset, bytes, &qiov, flags); -blk_dec_in_flight (blk); - -return ret; -} - -int blk_pwrite (BlockBackend *blk,int64_t offset,int64_t bytes, -const void *buf,BdrvRequestFlags flags) -{ -QEMUIOVector qiov =QEMU_IOVEC_INIT_BUF (qiov, buf, bytes); -IO_OR_GS_CODE (); - -return blk_pwritev_part (blk, offset, bytes, &qiov,0 , flags); -} -int64_t blk_getlength (BlockBackend *blk) {IO_CODE ();block/coroutines.h +0
-4@@ -112,10 +112,6 @@ bdrv_common_block_status_above(BlockDriverState *bs, int generated_co_wrappernbd_do_establish_connection (BlockDriverState *bs,bool blocking,Error **errp); -int generated_co_wrapper -blk_do_preadv (BlockBackend *blk,int64_t offset,int64_t bytes, -QEMUIOVector *qiov,BdrvRequestFlags flags); - int generated_co_wrapper blk_do_pwritev_part(BlockBackend *blk, int64_t offset, int64_t bytes, QEMUIOVector *qiov, size_t qiov_offset,block/meson.build +1
-0@@ -136,6 +136,7 @@ block_gen_c = custom_target('block-gen.c', input: files( '../include/block/block-io.h', '../include/block/block-global-state.h', + '../include/sysemu/block-backend-io.h', 'coroutines.h' ), command: [wrapper_py, '@OUTPUT@', '@INPUT@'])include/sysemu/block-backend-io.h +6
-4@@ -102,10 +102,12 @@ int coroutine_fn blk_co_copy_range(BlockBackend *blk_in, int64_t off_in,* the "I/O or GS" API. */ -int blk_pread (BlockBackend *blk,int64_t offset,int64_t bytes,void *buf, -BdrvRequestFlags flags); -int blk_pwrite (BlockBackend *blk,int64_t offset,int64_t bytes, -const void *buf,BdrvRequestFlags flags); +int generated_co_wrapper blk_pread(BlockBackend *blk, int64_t offset, +int64_t bytes,void *buf, +BdrvRequestFlags flags); +int generated_co_wrapper blk_pwrite(BlockBackend *blk, int64_t offset, +int64_t bytes,const void *buf, +BdrvRequestFlags flags); int coroutine_fn blk_co_preadv(BlockBackend *blk, int64_t offset,int64_t bytes,QEMUIOVector *qiov,BdrvRequestFlags flags);
Re: [PATCH 06/18] block: Implement blk_{pread, pwrite}() using generated_co_wrapper
Am 17/05/2022 um 16:22 schrieb Paolo Bonzini:
Quoted 13 lines · Alberto Faria
Quoted 4 lines
We need to add
include/sysemu/block-backend-io.hto the inputs of theblock-gen.ctarget defined inblock/meson.build.Signed-off-by Alberto Faria <[email protected]>Emanuele is looking it cleaning this up, so you two need to coordinate.
Emanuele, can you separate/post the initial patches to clean up the includes of
block/coroutines.handblock/block-gen.c?Apart from that, fewer
block/coroutines.hdeclarations is only good stuff.
This is the main patch: it just moves headers from block/coroutines.h to the script (block_gen.c).
This allows you to keep generated_co_wrapper functions in the header where they originally were (no need to move the function in coroutines.h and include it everywhere).
Btw @Alberto can you also cc me in the next series? So that I can follow too.
Thank you,
Emanuele
From 84fcea52c09024adcfe24bb0d6d2ec6842c6826b Mon Sep 17 00:00:00 2001
From: Emanuele Giuseppe Esposito <[email protected]>
Date: Tue, 17 May 2022 13:35:54 -0400
Subject: [PATCH] block-coroutine-wrapper: remove includes from coroutines.h
These includes in coroutines.h are not needed. Instead, they can be moved in block-gen.c since they are needed by the generated functions.
--- block/coroutines.h | 5 ----- scripts/block-coroutine-wrapper.py | 3 +++ 2 files changed, 3 insertions(+), 5 deletions(-)
block/coroutines.h +0 -5
@@ -25,11 +25,6 @@#ifndef BLOCK_COROUTINES_INT_H #define BLOCK_COROUTINES_INT_H -#include "block/block_int.h" - -/* For blk_bs() in generated block/block-gen.c */ -#include "sysemu/block-backend.h" -/* * I/O API functions. These functions are thread-safe. *
(quoted diff) +0 -0
b/scripts/block-coroutine-wrapper.py
index 625b03e3ab..39fb1e8a4f 100644
scripts/block-coroutine-wrapper.py +3 -0
@@ -40,6 +40,9 @@ def gen_header(): */ #include "qemu/osdep.h" +/* For blk_bs() in generated block/block-gen.c */ +#include "sysemu/block-backend.h" +#include "block/block_int.h" #include "block/coroutines.h" #include "block/block-gen.h" #include "block/block_int.h"\
Signature · 1 line
2.31.1
Quoted 96 lines
Quoted 95 lines
---
block/block-backend.c | 23 ----------------------- block/coroutines.h | 4 ---- block/meson.build | 1 +include/sysemu/block-backend-io.h| 10 ++++++----4 files changed, 7 insertions(+), 31 deletions(-)block/block-backend.c +0
-22@@ -1567,29 +1567,6 @@ BlockAIOCB *blk_aio_pwrite_zeroes(BlockBackend *blk, int64_t offset, flags | BDRV_REQ_ZERO_WRITE, cb, opaque); } -int blk_pread(BlockBackend *blk, int64_t offset, int64_t bytes, void *buf, - BdrvRequestFlags flags) -{ - int ret; - QEMUIOVector qiov = QEMU_IOVEC_INIT_BUF(qiov, buf, bytes); - IO_OR_GS_CODE(); - - blk_inc_in_flight(blk); - ret = blk_do_preadv(blk, offset, bytes, &qiov, flags); - blk_dec_in_flight(blk); - - return ret; -} - -int blk_pwrite (BlockBackend *blk,int64_t offset,int64_t bytes, - const void *buf, BdrvRequestFlags flags) -{ - QEMUIOVector qiov = QEMU_IOVEC_INIT_BUF(qiov, buf, bytes); - IO_OR_GS_CODE(); - - return blk_pwritev_part(blk, offset, bytes, &qiov, 0, flags); -} - int64_t blk_getlength(BlockBackend *blk){
IO_CODE();block/coroutines.h +0
-0@@ -112,10 +112,6 @@ bdrv_common_block_status_above(BlockDriverState *bs,int
generated_co_wrappernbd_do_establish_connection(BlockDriverState *bs, bool blocking, Error **errp);
-intgenerated_co_wrapperblock/coroutines.h +0
-3-blk_do_preadv(BlockBackend *blk, int64_t offset, int64_t bytes, - QEMUIOVector *qiov, BdrvRequestFlags flags); -int
generated_co_wrapper
blk_do_pwritev_part(BlockBackend *blk,int64_toffset,int64_tbytes, QEMUIOVector *qiov,size_tqiov_offset,block/meson.build +0
-0@@ -136,6 +136,7 @@ block_gen_c = custom_target('block-gen.c',input: files( '
../include/block/block-io.h',
'../include/block/block-global-state.h',
+
'../include/sysemu/block-backend-io.h',
'coroutines.h'
),
command: [wrapper_py, '@OUTPUT@', '@INPUT@'])include/sysemu/block-backend-io.h +6
-3@@ -102,10 +102,12 @@ int coroutine_fn blk_co_copy_range(BlockBackend*blk_in, int64_t off_in, * the "I/O or GS" API. */ -int blk_pread(BlockBackend *blk, int64_t offset, int64_t bytes, void *buf, - BdrvRequestFlags flags); -int blk_pwrite (BlockBackend *blk,int64_t offset,int64_t bytes, - const void *buf, BdrvRequestFlags flags); +int generated_co_wrapper blk_pread(BlockBackend *blk, int64_t offset, + int64_t bytes, void *buf, + BdrvRequestFlags flags); +int generated_co_wrapper blk_pwrite(BlockBackend *blk, int64_t offset, + int64_t bytes, const void *buf, + BdrvRequestFlags flags); int coroutine_fn blk_co_preadv(BlockBackend *blk, int64_t offset,
int64_tbytes, QEMUIOVector *qiov, BdrvRequestFlags flags);
Re: [PATCH 06/18] block: Implement blk_{pread, pwrite}() using generated_co_wrapper
scripts/block-coroutine-wrapper.py def gen_header(): · line 48
Quoted 6 lines · Emanuele Giuseppe Esposito
scripts/block-coroutine-wrapper.py +3
-0+/* For blk_bs() in generated block/block-gen.c */ +#include "sysemu/block-backend.h" +#include "block/block_int.h" #include "block/coroutines.h" #include "block/block-gen.h" #include "block/block_int.h"\
This second include of block_int.h is unnecessary.
Paolo
Re: [PATCH 06/18] block: Implement blk_{pread, pwrite}() using generated_co_wrapper
In reply to Emanuele Giuseppe EspositoQuoted 6 lines · Emanuele Giuseppe Esposito
This is the main patch: it just moves headers from
block/coroutines.hto the script (block_gen.c).This allows you to keep
generated_co_wrapperfunctions in the header where they originally were (no need to move the function incoroutines.hand include it everywhere).
Thanks. It doesn't look like it will conflict with this series.
Quoted 2 lines
Btw @Alberto can you also cc me in the next series? So that I can follow too.
Will do!
Alberto
Re: [PATCH 06/18] block: Implement blk_{pread,pwrite}() using generated_co_wrapper
In reply to Alberto FariaQuoted 10 lines · Alberto Faria
We need to add
include/sysemu/block-backend-io.hto the inputs of theblock-gen.ctarget defined inblock/meson.build.Signed-off-by Alberto Faria <[email protected]>--- block/block-backend.c | 23 ----------------------- block/coroutines.h | 4 ---- block/meson.build | 1 + include/sysemu/block-backend-io.h | 10 ++++++---- 4 files changed, 7 insertions(+), 31 deletions(-)
PATCH 7/18 block: Add blk_{preadv,pwritev}()
In reply to Alberto FariaImplement them using generated_co_wrapper.
--- include/sysemu/block-backend-io.h | 6 +++++ tests/unit/test-block-iothread.c | 42 ++++++++++++++++++++++++++++++- 2 files changed, 47 insertions(+), 1 deletion(-)
include/sysemu/block-backend-io.h +6 -0
@@ -108,6 +108,9 @@ int generated_co_wrapper blk_pread(BlockBackend *blk, int64_t offset, int generated_co_wrapper blk_pwrite(BlockBackend *blk, int64_t offset,int64_t bytes,const void *buf,BdrvRequestFlags flags); +int generated_co_wrapper blk_preadv(BlockBackend *blk, int64_t offset, +int64_t bytes,QEMUIOVector *qiov, +BdrvRequestFlags flags); int coroutine_fn blk_co_preadv(BlockBackend *blk, int64_t offset,int64_t bytes,QEMUIOVector *qiov,BdrvRequestFlags flags);
@@ -115,6 +118,9 @@ int coroutine_fn blk_co_pwritev_part(BlockBackend *blk, int64_t offset,int64_t bytes, QEMUIOVector *qiov, size_t qiov_offset, BdrvRequestFlags flags); +int generated_co_wrapper blk_pwritev(BlockBackend *blk, int64_t offset, +int64_t bytes,QEMUIOVector *qiov, +BdrvRequestFlags flags); int coroutine_fn blk_co_pwritev(BlockBackend *blk, int64_t offset,int64_t bytes,QEMUIOVector *qiov,BdrvRequestFlags flags);
tests/unit/test-block-iothread.c +41 -1
60 lines not on this page · raw message
Signature · 1 line
2.35.3
Re: [PATCH 07/18] block: Add blk_{preadv,pwritev}()
Quoted 7 lines · Alberto Faria
Implement them using
generated_co_wrapper.Signed-off-by Alberto Faria <[email protected]>--- include/sysemu/block-backend-io.h | 6 +++++ tests/unit/test-block-iothread.c | 42 ++++++++++++++++++++++++++++++- 2 files changed, 47 insertions(+), 1 deletion(-)
Quoted 91 lines
include/sysemu/block-backend-io.h +6
-0@@ -108,6 +108,9 @@ int generated_co_wrapper blk_pread(BlockBackend *blk, int64_t offset, int generated_co_wrapper blk_pwrite(BlockBackend *blk, int64_t offset,int64_t bytes,const void *buf,BdrvRequestFlags flags); +int generated_co_wrapper blk_preadv(BlockBackend *blk, int64_t offset, +int64_t bytes,QEMUIOVector *qiov, +BdrvRequestFlags flags); int coroutine_fn blk_co_preadv(BlockBackend *blk, int64_t offset,int64_t bytes,QEMUIOVector *qiov,BdrvRequestFlags flags);@@ -115,6 +118,9 @@ int coroutine_fn blk_co_pwritev_part(BlockBackend *blk, int64_t offset,int64_t bytes, QEMUIOVector *qiov, size_t qiov_offset, BdrvRequestFlags flags); +int generated_co_wrapper blk_pwritev(BlockBackend *blk, int64_t offset, +int64_t bytes,QEMUIOVector *qiov, +BdrvRequestFlags flags); int coroutine_fn blk_co_pwritev(BlockBackend *blk, int64_t offset,int64_t bytes,QEMUIOVector *qiov,BdrvRequestFlags flags);tests/unit/test-block-iothread.c +41
-1@@ -138,6 +138,36 @@ static void test_sync_op_blk_pwrite(BlockBackend *blk) g_assert_cmpint(ret, ==, -EIO); } +static void test_sync_op_blk_preadv (BlockBackend *blk) +{ +uint8_t buf[512 ]; +QEMUIOVector qiov =QEMU_IOVEC_INIT_BUF (qiov, buf,sizeof (buf)); +int ret; + +/* Success */ + ret =blk_preadv (blk,0 ,sizeof (buf), &qiov,0 ); + g_assert_cmpint(ret, ==, 0); + +/* Early error: Negative offset */ + ret =blk_preadv (blk,-2 ,sizeof (buf), &qiov,0 ); + g_assert_cmpint(ret, ==, -EIO); +} + +static void test_sync_op_blk_pwritev (BlockBackend *blk) +{ +uint8_t buf[512 ] = {0 }; +QEMUIOVector qiov =QEMU_IOVEC_INIT_BUF (qiov, buf,sizeof (buf)); +int ret; + +/* Success */ + ret =blk_pwritev (blk,0 ,sizeof (buf), &qiov,0 ); + g_assert_cmpint(ret, ==, 0); + +/* Early error: Negative offset */ + ret =blk_pwritev (blk,-2 ,sizeof (buf), &qiov,0 ); + g_assert_cmpint(ret, ==, -EIO); +} +static void test_sync_op_load_vmstate (BdrvChild *c) {uint8_t buf[512 ];@@ -301,6 +331,14 @@ const SyncOpTest sync_op_tests[] = { .name = "/sync-op/pwrite", .fn = test_sync_op_pwrite, .blkfn = test_sync_op_blk_pwrite, + }, { + .name = "/sync-op/preadv", + .fn = NULL, + .blkfn = test_sync_op_blk_preadv, + }, { + .name = "/sync-op/pwritev", + .fn = NULL, + .blkfn = test_sync_op_blk_pwritev, }, { .name = "/sync-op/load_vmstate", .fn = test_sync_op_load_vmstate,@@ -349,7 +387,9 @@ static void test_sync_op(const void *opaque)blk_set_aio_context (blk, ctx, &error_abort);aio_context_acquire (ctx); - t->fn (c); +if (t->fn) { + t->fn (c); + }if (t->blkfn) { t->blkfn (blk); }
Re: [PATCH 07/18] block: Add blk_{preadv,pwritev}()
In reply to Alberto FariaQuoted 7 lines · Alberto Faria
Implement them using
generated_co_wrapper.Signed-off-by Alberto Faria <[email protected]>--- include/sysemu/block-backend-io.h | 6 +++++ tests/unit/test-block-iothread.c | 42 ++++++++++++++++++++++++++++++- 2 files changed, 47 insertions(+), 1 deletion(-)
PATCH 8/18 block: Add blk_[co_]preadv_part()
In reply to Alberto FariaImplement blk_preadv_part() using generated_co_wrapper.
--- block/block-backend.c | 30 +++++++++++++++++++++++------- block/coroutines.h | 5 ----- include/sysemu/block-backend-io.h | 7 +++++++ tests/unit/test-block-iothread.c | 19 +++++++++++++++++++ 4 files changed, 49 insertions(+), 12 deletions(-)
block/block-backend.c +23 -7
@@ -1284,9 +1284,10 @@ static void coroutine_fn blk_wait_while_drained(BlockBackend *blk) }/* To be called between exactly one pair of blk_inc/dec_in_flight() */ -int coroutine_fn -blk_co_do_preadv (BlockBackend *blk,int64_t offset,int64_t bytes, -QEMUIOVector *qiov,BdrvRequestFlags flags) +static int coroutine_fn +blk_co_do_preadv_part (BlockBackend *blk,int64_t offset,int64_t bytes, +QEMUIOVector *qiov,size_t qiov_offset, +BdrvRequestFlags flags) {int ret;BlockDriverState *bs;
@@ -1311,7 +1312,8 @@ blk_co_do_preadv(BlockBackend *blk, int64_t offset, int64_t bytes, bytes, false); } - ret =bdrv_co_preadv (blk->root, offset, bytes, qiov, flags); + ret =bdrv_co_preadv_part (blk->root, offset, bytes, qiov, qiov_offset, + flags);bdrv_dec_in_flight (bs);return ret; }
@@ -1324,7 +1326,21 @@ int coroutine_fn blk_co_preadv(BlockBackend *blk, int64_t offset,IO_OR_GS_CODE ();blk_inc_in_flight (blk); - ret =blk_co_do_preadv (blk, offset, bytes, qiov, flags); + ret =blk_co_do_preadv_part (blk, offset, bytes, qiov,0 , flags); +blk_dec_in_flight (blk); + +return ret; +} + +int coroutine_fn blk_co_preadv_part(BlockBackend *blk, int64_t offset, +int64_t bytes,QEMUIOVector *qiov, +size_t qiov_offset,BdrvRequestFlags flags) +{ +int ret; +IO_OR_GS_CODE (); + +blk_inc_in_flight (blk); + ret =blk_co_do_preadv_part (blk, offset, bytes, qiov, qiov_offset, flags);blk_dec_in_flight (blk);return ret;
@@ -1541,8 +1557,8 @@ static void blk_aio_read_entry(void *opaque)QEMUIOVector *qiov = rwco->iobuf;assert (qiov->size == acb->bytes); - rwco->ret =blk_co_do_preadv (rwco->blk, rwco->offset, acb->bytes, - qiov, rwco->flags); + rwco->ret =blk_co_do_preadv_part (rwco->blk, rwco->offset, acb->bytes, qiov, +0 , rwco->flags);blk_aio_complete (acb); }
block/coroutines.h +0 -5
@@ -63,11 +63,6 @@ nbd_co_do_establish_connection(BlockDriverState *bs, bool blocking, Error **errp); -int coroutine_fn -blk_co_do_preadv (BlockBackend *blk,int64_t offset,int64_t bytes, -QEMUIOVector *qiov,BdrvRequestFlags flags); - - int coroutine_fn blk_co_do_pwritev_part(BlockBackend *blk, int64_t offset, int64_t bytes, QEMUIOVector *qiov, size_t qiov_offset,
include/sysemu/block-backend-io.h +7 -0
@@ -108,6 +108,13 @@ int generated_co_wrapper blk_pread(BlockBackend *blk, int64_t offset, int generated_co_wrapper blk_pwrite(BlockBackend *blk, int64_t offset,int64_t bytes,const void *buf,BdrvRequestFlags flags); +int generated_co_wrapper blk_preadv_part(BlockBackend *blk, int64_t offset, +int64_t bytes,QEMUIOVector *qiov, +size_t qiov_offset, +BdrvRequestFlags flags); +int coroutine_fn blk_co_preadv_part(BlockBackend *blk, int64_t offset, +int64_t bytes,QEMUIOVector *qiov, +size_t qiov_offset,BdrvRequestFlags flags); int generated_co_wrapper blk_preadv(BlockBackend *blk, int64_t offset,int64_t bytes,QEMUIOVector *qiov,BdrvRequestFlags flags);
tests/unit/test-block-iothread.c +19 -0
@@ -168,6 +168,21 @@ static void test_sync_op_blk_pwritev(BlockBackend *blk) g_assert_cmpint(ret, ==, -EIO); } +static void test_sync_op_blk_preadv_part (BlockBackend *blk) +{ +uint8_t buf[512 ]; +QEMUIOVector qiov =QEMU_IOVEC_INIT_BUF (qiov, buf,sizeof (buf)); +int ret; + +/* Success */ + ret =blk_preadv_part (blk,0 ,sizeof (buf), &qiov,0 ,0 ); + g_assert_cmpint(ret, ==, 0); + +/* Early error: Negative offset */ + ret =blk_preadv_part (blk,-2 ,sizeof (buf), &qiov,0 ,0 ); + g_assert_cmpint(ret, ==, -EIO); +} +static void test_sync_op_load_vmstate (BdrvChild *c) {uint8_t buf[512 ];
@@ -339,6 +354,10 @@ const SyncOpTest sync_op_tests[] = { .name = "/sync-op/pwritev", .fn = NULL, .blkfn = test_sync_op_blk_pwritev, + }, { + .name = "/sync-op/preadv_part", + .fn = NULL, + .blkfn = test_sync_op_blk_preadv_part, }, { .name = "/sync-op/load_vmstate", .fn = test_sync_op_load_vmstate,
Signature · 1 line
2.35.3
Re: [PATCH 08/18] block: Add blk_[co_]preadv_part()
Quoted 9 lines · Alberto Faria
Implement
blk_preadv_part()usinggenerated_co_wrapper.Signed-off-by Alberto Faria <[email protected]>--- block/block-backend.c | 30 +++++++++++++++++++++++------- block/coroutines.h | 5 ----- include/sysemu/block-backend-io.h | 7 +++++++ tests/unit/test-block-iothread.c | 19 +++++++++++++++++++ 4 files changed, 49 insertions(+), 12 deletions(-)
Quoted 133 lines
block/block-backend.c +23
-7@@ -1284,9 +1284,10 @@ static void coroutine_fn blk_wait_while_drained(BlockBackend *blk) }/* To be called between exactly one pair of blk_inc/dec_in_flight() */ -int coroutine_fn -blk_co_do_preadv (BlockBackend *blk,int64_t offset,int64_t bytes, -QEMUIOVector *qiov,BdrvRequestFlags flags) +static int coroutine_fn +blk_co_do_preadv_part (BlockBackend *blk,int64_t offset,int64_t bytes, +QEMUIOVector *qiov,size_t qiov_offset, +BdrvRequestFlags flags) {int ret;BlockDriverState *bs;@@ -1311,7 +1312,8 @@ blk_co_do_preadv(BlockBackend *blk, int64_t offset, int64_t bytes, bytes, false); } - ret =bdrv_co_preadv (blk->root, offset, bytes, qiov, flags); + ret =bdrv_co_preadv_part (blk->root, offset, bytes, qiov, qiov_offset, + flags);bdrv_dec_in_flight (bs);return ret; }@@ -1324,7 +1326,21 @@ int coroutine_fn blk_co_preadv(BlockBackend *blk, int64_t offset,IO_OR_GS_CODE ();blk_inc_in_flight (blk); - ret =blk_co_do_preadv (blk, offset, bytes, qiov, flags); + ret =blk_co_do_preadv_part (blk, offset, bytes, qiov,0 , flags); +blk_dec_in_flight (blk); + +return ret; +} + +int coroutine_fn blk_co_preadv_part(BlockBackend *blk, int64_t offset, +int64_t bytes,QEMUIOVector *qiov, +size_t qiov_offset,BdrvRequestFlags flags) +{ +int ret; +IO_OR_GS_CODE (); + +blk_inc_in_flight (blk); + ret =blk_co_do_preadv_part (blk, offset, bytes, qiov, qiov_offset, flags);blk_dec_in_flight (blk);return ret;@@ -1541,8 +1557,8 @@ static void blk_aio_read_entry(void *opaque)QEMUIOVector *qiov = rwco->iobuf;assert (qiov->size == acb->bytes); - rwco->ret =blk_co_do_preadv (rwco->blk, rwco->offset, acb->bytes, - qiov, rwco->flags); + rwco->ret =blk_co_do_preadv_part (rwco->blk, rwco->offset, acb->bytes, qiov, +0 , rwco->flags);blk_aio_complete (acb); }block/coroutines.h +0
-5@@ -63,11 +63,6 @@ nbd_co_do_establish_connection(BlockDriverState *bs, bool blocking, Error **errp); -int coroutine_fn -blk_co_do_preadv (BlockBackend *blk,int64_t offset,int64_t bytes, -QEMUIOVector *qiov,BdrvRequestFlags flags); - - int coroutine_fn blk_co_do_pwritev_part(BlockBackend *blk, int64_t offset, int64_t bytes, QEMUIOVector *qiov, size_t qiov_offset,include/sysemu/block-backend-io.h +7
-0@@ -108,6 +108,13 @@ int generated_co_wrapper blk_pread(BlockBackend *blk, int64_t offset, int generated_co_wrapper blk_pwrite(BlockBackend *blk, int64_t offset,int64_t bytes,const void *buf,BdrvRequestFlags flags); +int generated_co_wrapper blk_preadv_part(BlockBackend *blk, int64_t offset, +int64_t bytes,QEMUIOVector *qiov, +size_t qiov_offset, +BdrvRequestFlags flags); +int coroutine_fn blk_co_preadv_part(BlockBackend *blk, int64_t offset, +int64_t bytes,QEMUIOVector *qiov, +size_t qiov_offset,BdrvRequestFlags flags); int generated_co_wrapper blk_preadv(BlockBackend *blk, int64_t offset,int64_t bytes,QEMUIOVector *qiov,BdrvRequestFlags flags);tests/unit/test-block-iothread.c +19
-0@@ -168,6 +168,21 @@ static void test_sync_op_blk_pwritev(BlockBackend *blk) g_assert_cmpint(ret, ==, -EIO); } +static void test_sync_op_blk_preadv_part (BlockBackend *blk) +{ +uint8_t buf[512 ]; +QEMUIOVector qiov =QEMU_IOVEC_INIT_BUF (qiov, buf,sizeof (buf)); +int ret; + +/* Success */ + ret =blk_preadv_part (blk,0 ,sizeof (buf), &qiov,0 ,0 ); + g_assert_cmpint(ret, ==, 0); + +/* Early error: Negative offset */ + ret =blk_preadv_part (blk,-2 ,sizeof (buf), &qiov,0 ,0 ); + g_assert_cmpint(ret, ==, -EIO); +} +static void test_sync_op_load_vmstate (BdrvChild *c) {uint8_t buf[512 ];@@ -339,6 +354,10 @@ const SyncOpTest sync_op_tests[] = { .name = "/sync-op/pwritev", .fn = NULL, .blkfn = test_sync_op_blk_pwritev, + }, { + .name = "/sync-op/preadv_part", + .fn = NULL, + .blkfn = test_sync_op_blk_preadv_part, }, { .name = "/sync-op/load_vmstate", .fn = test_sync_op_load_vmstate,
Re: [PATCH 08/18] block: Add blk_[co_]preadv_part()
In reply to Alberto FariaQuoted 9 lines · Alberto Faria
Implement
blk_preadv_part()usinggenerated_co_wrapper.Signed-off-by Alberto Faria <[email protected]>--- block/block-backend.c | 30 +++++++++++++++++++++++------- block/coroutines.h | 5 ----- include/sysemu/block-backend-io.h | 7 +++++++ tests/unit/test-block-iothread.c | 19 +++++++++++++++++++ 4 files changed, 49 insertions(+), 12 deletions(-)
PATCH 9/18 block: Export blk_pwritev_part() in block-backend-io.h
In reply to Alberto FariaAlso convert it into a generated_co_wrapper.
--- block/block-backend.c | 14 -------------- block/coroutines.h | 5 ----- include/sysemu/block-backend-io.h | 4 ++++ tests/unit/test-block-iothread.c | 19 +++++++++++++++++++ 4 files changed, 23 insertions(+), 19 deletions(-)
block/block-backend.c +0 -14
@@ -1407,20 +1407,6 @@ int coroutine_fn blk_co_pwritev(BlockBackend *blk, int64_t offset,return blk_co_pwritev_part (blk, offset, bytes, qiov,0 , flags); } -static int coroutine_fn blk_pwritev_part(BlockBackend *blk, int64_t offset, -int64_t bytes, -QEMUIOVector *qiov,size_t qiov_offset, -BdrvRequestFlags flags) -{ -int ret; - -blk_inc_in_flight (blk); - ret =blk_do_pwritev_part (blk, offset, bytes, qiov, qiov_offset, flags); -blk_dec_in_flight (blk); - -return ret; -} - typedef struct BlkRwCo { BlockBackend *blk; int64_t offset;
block/coroutines.h +0 -5
@@ -107,11 +107,6 @@ bdrv_common_block_status_above(BlockDriverState *bs, int generated_co_wrappernbd_do_establish_connection (BlockDriverState *bs,bool blocking,Error **errp); -int generated_co_wrapper -blk_do_pwritev_part (BlockBackend *blk,int64_t offset,int64_t bytes, -QEMUIOVector *qiov,size_t qiov_offset, -BdrvRequestFlags flags); - int generated_co_wrapperblk_do_ioctl (BlockBackend *blk,unsigned long int req,void *buf);
include/sysemu/block-backend-io.h +4 -0
@@ -121,6 +121,10 @@ int generated_co_wrapper blk_preadv(BlockBackend *blk, int64_t offset, int coroutine_fn blk_co_preadv(BlockBackend *blk, int64_t offset,int64_t bytes,QEMUIOVector *qiov,BdrvRequestFlags flags); +int generated_co_wrapper blk_pwritev_part(BlockBackend *blk, int64_t offset, +int64_t bytes,QEMUIOVector *qiov, +size_t qiov_offset, +BdrvRequestFlags flags); int coroutine_fn blk_co_pwritev_part(BlockBackend *blk, int64_t offset, int64_t bytes, QEMUIOVector *qiov, size_t qiov_offset,
tests/unit/test-block-iothread.c +19 -0
@@ -183,6 +183,21 @@ static void test_sync_op_blk_preadv_part(BlockBackend *blk) g_assert_cmpint(ret, ==, -EIO); } +static void test_sync_op_blk_pwritev_part (BlockBackend *blk) +{ +uint8_t buf[512 ]; +QEMUIOVector qiov =QEMU_IOVEC_INIT_BUF (qiov, buf,sizeof (buf)); +int ret; + +/* Success */ + ret =blk_pwritev_part (blk,0 ,sizeof (buf), &qiov,0 ,0 ); + g_assert_cmpint(ret, ==, 0); + +/* Early error: Negative offset */ + ret =blk_pwritev_part (blk,-2 ,sizeof (buf), &qiov,0 ,0 ); + g_assert_cmpint(ret, ==, -EIO); +} +static void test_sync_op_load_vmstate (BdrvChild *c) {uint8_t buf[512 ];
@@ -358,6 +373,10 @@ const SyncOpTest sync_op_tests[] = { .name = "/sync-op/preadv_part", .fn = NULL, .blkfn = test_sync_op_blk_preadv_part, + }, { + .name = "/sync-op/pwritev_part", + .fn = NULL, + .blkfn = test_sync_op_blk_pwritev_part, }, { .name = "/sync-op/load_vmstate", .fn = test_sync_op_load_vmstate,
Signature · 1 line
2.35.3
Re: [PATCH 09/18] block: Export blk_pwritev_part() in block-backend-io.h
Quoted 9 lines · Alberto Faria
Also convert it into a
generated_co_wrapper.Signed-off-by Alberto Faria <[email protected]>--- block/block-backend.c | 14 -------------- block/coroutines.h | 5 ----- include/sysemu/block-backend-io.h | 4 ++++ tests/unit/test-block-iothread.c | 19 +++++++++++++++++++ 4 files changed, 23 insertions(+), 19 deletions(-)
Re: [PATCH 09/18] block: Export blk_pwritev_part() in block-backend-io.h
In reply to Alberto FariaQuoted 9 lines · Alberto Faria
Also convert it into a
generated_co_wrapper.Signed-off-by Alberto Faria <[email protected]>--- block/block-backend.c | 14 -------------- block/coroutines.h | 5 ----- include/sysemu/block-backend-io.h | 4 ++++ tests/unit/test-block-iothread.c | 19 +++++++++++++++++++ 4 files changed, 23 insertions(+), 19 deletions(-)
[...]
tests/unit/test-block-iothread.c static void test_sync_op_blk_preadv_part(BlockBackend *blk) · line 188
Quoted 11 lines
tests/unit/test-block-iothread.c +3
-0@@ -183,6 +183,21 @@ static void test_sync_op_blk_preadv_part(BlockBackend *blk) g_assert_cmpint(ret, ==, -EIO); } +static void test_sync_op_blk_pwritev_part (BlockBackend *blk) +{ +uint8_t buf[512 ];
Given you’ve initialized this in test_sync_op_blk_pwritev(), I think it should be initialized here, too.
With that done:
Quoted 12 lines
tests/unit/test-block-iothread.c +12
-0+QEMUIOVector qiov =QEMU_IOVEC_INIT_BUF (qiov, buf,sizeof (buf)); +int ret; + +/* Success */ + ret =blk_pwritev_part (blk,0 ,sizeof (buf), &qiov,0 ,0 ); + g_assert_cmpint(ret, ==, 0); + +/* Early error: Negative offset */ + ret =blk_pwritev_part (blk,-2 ,sizeof (buf), &qiov,0 ,0 ); + g_assert_cmpint(ret, ==, -EIO); +} +
PATCH 10/18 block: Change blk_pwrite_compressed() param order
In reply to Alberto FariaSwap 'buf' and 'bytes' around for consistency with other I/O functions.
--- block/block-backend.c | 4 ++-- include/sysemu/block-backend-io.h | 4 ++-- qemu-img.c | 2 +- qemu-io-cmds.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-)
block/block-backend.c +2 -2
@@ -2324,8 +2324,8 @@ int coroutine_fn blk_co_pwrite_zeroes(BlockBackend *blk, int64_t offset, flags | BDRV_REQ_ZERO_WRITE); } -int blk_pwrite_compressed (BlockBackend *blk,int64_t offset,const void *buf, -int64_t bytes) +int blk_pwrite_compressed (BlockBackend *blk,int64_t offset,int64_t bytes, +const void *buf) {QEMUIOVector qiov =QEMU_IOVEC_INIT_BUF (qiov, buf, bytes);IO_OR_GS_CODE ();
include/sysemu/block-backend-io.h +2 -2
@@ -168,8 +168,8 @@ int blk_flush(BlockBackend *blk);int blk_ioctl (BlockBackend *blk,unsigned long int req,void *buf); -int blk_pwrite_compressed (BlockBackend *blk,int64_t offset,const void *buf, -int64_t bytes); +int blk_pwrite_compressed (BlockBackend *blk,int64_t offset,int64_t bytes, +const void *buf);int blk_pdiscard (BlockBackend *blk,int64_t offset,int64_t bytes);int blk_pwrite_zeroes (BlockBackend *blk,int64_t offset,int64_t bytes,BdrvRequestFlags flags);
qemu-img.c +1 -1
@@ -2114,7 +2114,7 @@ static int convert_do_copy(ImgConvertState *s)if (s->compressed && !s->ret) {/* signal EOF to align */ - ret =blk_pwrite_compressed (s->target,0 ,NULL ,0 ); + ret =blk_pwrite_compressed (s->target,0 ,0 ,NULL );if (ret <0 ) {return ret; }
qemu-io-cmds.c +1 -1
@@ -631,7 +631,7 @@ static int do_write_compressed(BlockBackend *blk, char *buf, int64_t offset,return -ERANGE ; } - ret =blk_pwrite_compressed (blk, offset, buf, bytes); + ret =blk_pwrite_compressed (blk, offset, bytes, buf);if (ret <0 ) {return ret; }
Signature · 1 line
2.35.3
Re: [PATCH 10/18] block: Change blk_pwrite_compressed() param order
Quoted 3 lines · Alberto Faria
Swap 'buf' and 'bytes' around for consistency with other I/O functions.
Signed-off-by Alberto Faria <[email protected]>
Quoted 63 lines
--- block/block-backend.c | 4 ++-- include/sysemu/block-backend-io.h | 4 ++-- qemu-img.c | 2 +- qemu-io-cmds.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-)block/block-backend.c +2
-2@@ -2324,8 +2324,8 @@ int coroutine_fn blk_co_pwrite_zeroes(BlockBackend *blk, int64_t offset, flags | BDRV_REQ_ZERO_WRITE); } -int blk_pwrite_compressed (BlockBackend *blk,int64_t offset,const void *buf, -int64_t bytes) +int blk_pwrite_compressed (BlockBackend *blk,int64_t offset,int64_t bytes, +const void *buf) {QEMUIOVector qiov =QEMU_IOVEC_INIT_BUF (qiov, buf, bytes);IO_OR_GS_CODE ();include/sysemu/block-backend-io.h +2
-2@@ -168,8 +168,8 @@ int blk_flush(BlockBackend *blk);int blk_ioctl (BlockBackend *blk,unsigned long int req,void *buf); -int blk_pwrite_compressed (BlockBackend *blk,int64_t offset,const void *buf, -int64_t bytes); +int blk_pwrite_compressed (BlockBackend *blk,int64_t offset,int64_t bytes, +const void *buf);int blk_pdiscard (BlockBackend *blk,int64_t offset,int64_t bytes);int blk_pwrite_zeroes (BlockBackend *blk,int64_t offset,int64_t bytes,BdrvRequestFlags flags);qemu-img.c +1
-1@@ -2114,7 +2114,7 @@ static int convert_do_copy(ImgConvertState *s)if (s->compressed && !s->ret) {/* signal EOF to align */ - ret =blk_pwrite_compressed (s->target,0 ,NULL ,0 ); + ret =blk_pwrite_compressed (s->target,0 ,0 ,NULL );if (ret <0 ) {return ret; }qemu-io-cmds.c +1
-1@@ -631,7 +631,7 @@ static int do_write_compressed(BlockBackend *blk, char *buf, int64_t offset,return -ERANGE ; } - ret =blk_pwrite_compressed (blk, offset, buf, bytes); + ret =blk_pwrite_compressed (blk, offset, bytes, buf);if (ret <0 ) {return ret; }
Re: [PATCH 10/18] block: Change blk_pwrite_compressed() param order
In reply to Alberto FariaQuoted 9 lines · Alberto Faria
Swap 'buf' and 'bytes' around for consistency with other I/O functions.
Signed-off-by Alberto Faria <[email protected]>--- block/block-backend.c | 4 ++-- include/sysemu/block-backend-io.h | 4 ++-- qemu-img.c | 2 +- qemu-io-cmds.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-)
PATCH 11/18 block: Add blk_co_pwrite_compressed()
In reply to Alberto FariaAlso convert blk_pwrite_compressed() into a generated_co_wrapper.
--- block/block-backend.c | 8 ++++---- include/sysemu/block-backend-io.h | 7 +++++-- tests/unit/test-block-iothread.c | 18 ++++++++++++++++++ 3 files changed, 27 insertions(+), 6 deletions(-)
block/block-backend.c +4 -4
@@ -2324,13 +2324,13 @@ int coroutine_fn blk_co_pwrite_zeroes(BlockBackend *blk, int64_t offset, flags | BDRV_REQ_ZERO_WRITE); } -int blk_pwrite_compressed (BlockBackend *blk,int64_t offset,int64_t bytes, -const void *buf) +int coroutine_fn blk_co_pwrite_compressed(BlockBackend *blk, int64_t offset, +int64_t bytes,const void *buf) {QEMUIOVector qiov =QEMU_IOVEC_INIT_BUF (qiov, buf, bytes);IO_OR_GS_CODE (); -return blk_pwritev_part (blk, offset, bytes, &qiov,0 , -BDRV_REQ_WRITE_COMPRESSED ); +return blk_co_pwritev_part (blk, offset, bytes, &qiov,0 , +BDRV_REQ_WRITE_COMPRESSED ); } int blk_truncate(BlockBackend *blk, int64_t offset, bool exact,
include/sysemu/block-backend-io.h +5 -2
@@ -168,8 +168,11 @@ int blk_flush(BlockBackend *blk);int blk_ioctl (BlockBackend *blk,unsigned long int req,void *buf); -int blk_pwrite_compressed (BlockBackend *blk,int64_t offset,int64_t bytes, -const void *buf); +int generated_co_wrapper blk_pwrite_compressed(BlockBackend *blk, +int64_t offset,int64_t bytes, +const void *buf); +int coroutine_fn blk_co_pwrite_compressed(BlockBackend *blk, int64_t offset, +int64_t bytes,const void *buf);int blk_pdiscard (BlockBackend *blk,int64_t offset,int64_t bytes);int blk_pwrite_zeroes (BlockBackend *blk,int64_t offset,int64_t bytes,BdrvRequestFlags flags);
tests/unit/test-block-iothread.c +18 -0
@@ -198,6 +198,20 @@ static void test_sync_op_blk_pwritev_part(BlockBackend *blk) g_assert_cmpint(ret, ==, -EIO); } +static void test_sync_op_blk_pwrite_compressed (BlockBackend *blk) +{ +uint8_t buf[512 ] = {0 }; +int ret; + +/* Late error: Not supported */ + ret =blk_pwrite_compressed (blk,0 ,sizeof (buf), buf); + g_assert_cmpint(ret, ==, -ENOTSUP); + +/* Early error: Negative offset */ + ret =blk_pwrite_compressed (blk,-2 ,sizeof (buf), buf); + g_assert_cmpint(ret, ==, -EIO); +} +static void test_sync_op_load_vmstate (BdrvChild *c) {uint8_t buf[512 ];
@@ -377,6 +391,10 @@ const SyncOpTest sync_op_tests[] = { .name = "/sync-op/pwritev_part", .fn = NULL, .blkfn = test_sync_op_blk_pwritev_part, + }, { + .name = "/sync-op/pwrite_compressed", + .fn = NULL, + .blkfn = test_sync_op_blk_pwrite_compressed, }, { .name = "/sync-op/load_vmstate", .fn = test_sync_op_load_vmstate,
Signature · 1 line
2.35.3
Re: [PATCH 11/18] block: Add blk_co_pwrite_compressed()
Quoted 3 lines · Alberto Faria
Also convert
blk_pwrite_compressed()into agenerated_co_wrapper.Signed-off-by Alberto Faria <[email protected]>
Re: [PATCH 11/18] block: Add blk_co_pwrite_compressed()
In reply to Alberto FariaQuoted 8 lines · Alberto Faria
Also convert
blk_pwrite_compressed()into agenerated_co_wrapper.Signed-off-by Alberto Faria <[email protected]>--- block/block-backend.c | 8 ++++---- include/sysemu/block-backend-io.h | 7 +++++-- tests/unit/test-block-iothread.c | 18 ++++++++++++++++++ 3 files changed, 27 insertions(+), 6 deletions(-)
PATCH 12/18 block: Implement blk_pwrite_zeroes() using generated_co_wrapper
In reply to Alberto Faria--- block/block-backend.c | 8 -------- include/sysemu/block-backend-io.h | 5 +++-- tests/unit/test-block-iothread.c | 17 +++++++++++++++++ 3 files changed, 20 insertions(+), 10 deletions(-)
block/block-backend.c +0 -8
@@ -1415,14 +1415,6 @@ typedef struct BlkRwCo {BdrvRequestFlags flags; } BlkRwCo; -int blk_pwrite_zeroes (BlockBackend *blk,int64_t offset, -int64_t bytes,BdrvRequestFlags flags) -{ -IO_OR_GS_CODE (); -return blk_pwritev_part (blk, offset, bytes,NULL ,0 , - flags |BDRV_REQ_ZERO_WRITE ); -} -int blk_make_zero (BlockBackend *blk,BdrvRequestFlags flags) {GLOBAL_STATE_CODE ();
include/sysemu/block-backend-io.h +3 -2
@@ -174,8 +174,9 @@ int generated_co_wrapper blk_pwrite_compressed(BlockBackend *blk, int coroutine_fn blk_co_pwrite_compressed(BlockBackend *blk, int64_t offset,int64_t bytes,const void *buf);int blk_pdiscard (BlockBackend *blk,int64_t offset,int64_t bytes); -int blk_pwrite_zeroes (BlockBackend *blk,int64_t offset, -int64_t bytes,BdrvRequestFlags flags); +int generated_co_wrapper blk_pwrite_zeroes(BlockBackend *blk, int64_t offset, +int64_t bytes, +BdrvRequestFlags flags); int coroutine_fn blk_co_pwrite_zeroes(BlockBackend *blk, int64_t offset,int64_t bytes,BdrvRequestFlags flags); int blk_truncate(BlockBackend *blk, int64_t offset, bool exact,
tests/unit/test-block-iothread.c +17 -0
@@ -212,6 +212,19 @@ static void test_sync_op_blk_pwrite_compressed(BlockBackend *blk) g_assert_cmpint(ret, ==, -EIO); } +static void test_sync_op_blk_pwrite_zeroes (BlockBackend *blk) +{ +int ret; + +/* Success */ + ret =blk_pwrite_zeroes (blk,0 ,512 ,0 ); + g_assert_cmpint(ret, ==, 0); + +/* Early error: Negative offset */ + ret =blk_pwrite_zeroes (blk,-2 ,512 ,0 ); + g_assert_cmpint(ret, ==, -EIO); +} +static void test_sync_op_load_vmstate (BdrvChild *c) {uint8_t buf[512 ];
@@ -395,6 +408,10 @@ const SyncOpTest sync_op_tests[] = { .name = "/sync-op/pwrite_compressed", .fn = NULL, .blkfn = test_sync_op_blk_pwrite_compressed, + }, { + .name = "/sync-op/pwrite_zeroes", + .fn = NULL, + .blkfn = test_sync_op_blk_pwrite_zeroes, }, { .name = "/sync-op/load_vmstate", .fn = test_sync_op_load_vmstate,
Signature · 1 line
2.35.3
Re: [PATCH 12/18] block: Implement blk_pwrite_zeroes() using generated_co_wrapper
Quoted 6 lines · Alberto Faria
Signed-off-by Alberto Faria <[email protected]>--- block/block-backend.c | 8 -------- include/sysemu/block-backend-io.h | 5 +++-- tests/unit/test-block-iothread.c | 17 +++++++++++++++++ 3 files changed, 20 insertions(+), 10 deletions(-)
Re: [PATCH 12/18] block: Implement blk_pwrite_zeroes() using generated_co_wrapper
In reply to Alberto FariaQuoted 6 lines · Alberto Faria
Signed-off-by Alberto Faria <[email protected]>--- block/block-backend.c | 8 -------- include/sysemu/block-backend-io.h | 5 +++-- tests/unit/test-block-iothread.c | 17 +++++++++++++++++ 3 files changed, 20 insertions(+), 10 deletions(-)
PATCH 13/18 block: Implement blk_pdiscard() using generated_co_wrapper
In reply to Alberto Faria--- block/block-backend.c | 12 ------------ block/coroutines.h | 3 --- include/sysemu/block-backend-io.h | 3 ++- 3 files changed, 2 insertions(+), 16 deletions(-)
block/block-backend.c +0 -12
@@ -1715,18 +1715,6 @@ int coroutine_fn blk_co_pdiscard(BlockBackend *blk, int64_t offset,return ret; } -int blk_pdiscard (BlockBackend *blk,int64_t offset,int64_t bytes) -{ -int ret; -IO_OR_GS_CODE (); - -blk_inc_in_flight (blk); - ret =blk_do_pdiscard (blk, offset, bytes); -blk_dec_in_flight (blk); - -return ret; -} -/* To be called between exactly one pair of blk_inc/dec_in_flight() */ int coroutine_fn blk_co_do_flush(BlockBackend *blk) {
block/coroutines.h +0 -3
@@ -110,9 +110,6 @@ nbd_do_establish_connection(BlockDriverState *bs, bool blocking, Error **errp); int generated_co_wrapperblk_do_ioctl (BlockBackend *blk,unsigned long int req,void *buf); -int generated_co_wrapper -blk_do_pdiscard (BlockBackend *blk,int64_t offset,int64_t bytes); - int generated_co_wrapper blk_do_flush(BlockBackend *blk);#endif /* BLOCK_COROUTINES_H */
include/sysemu/block-backend-io.h +2 -1
@@ -160,6 +160,8 @@ static inline int coroutine_fn blk_co_pwrite(BlockBackend *blk, int64_t offset,return blk_co_pwritev (blk, offset, bytes, &qiov, flags); } +int generated_co_wrapper blk_pdiscard(BlockBackend *blk, int64_t offset, +int64_t bytes); int coroutine_fn blk_co_pdiscard(BlockBackend *blk, int64_t offset,int64_t bytes);
@@ -173,7 +175,6 @@ int generated_co_wrapper blk_pwrite_compressed(BlockBackend *blk, const void *buf); int coroutine_fn blk_co_pwrite_compressed(BlockBackend *blk, int64_t offset,int64_t bytes,const void *buf); -int blk_pdiscard (BlockBackend *blk,int64_t offset,int64_t bytes); int generated_co_wrapper blk_pwrite_zeroes(BlockBackend *blk, int64_t offset,int64_t bytes,BdrvRequestFlags flags);
Signature · 1 line
2.35.3
Re: [PATCH 13/18] block: Implement blk_pdiscard() using generated_co_wrapper
Quoted 6 lines · Alberto Faria
Signed-off-by Alberto Faria <[email protected]>--- block/block-backend.c | 12 ------------ block/coroutines.h | 3 --- include/sysemu/block-backend-io.h | 3 ++- 3 files changed, 2 insertions(+), 16 deletions(-)
Re: [PATCH 13/18] block: Implement blk_pdiscard() using generated_co_wrapper
In reply to Alberto FariaQuoted 6 lines · Alberto Faria
Signed-off-by Alberto Faria <[email protected]>--- block/block-backend.c | 12 ------------ block/coroutines.h | 3 --- include/sysemu/block-backend-io.h | 3 ++- 3 files changed, 2 insertions(+), 16 deletions(-)
PATCH 14/18 block: Implement blk_flush() using generated_co_wrapper
In reply to Alberto Faria--- block/block-backend.c | 11 ----------- block/coroutines.h | 2 -- include/sysemu/block-backend-io.h | 2 +- 3 files changed, 1 insertion(+), 14 deletions(-)
block/block-backend.c +0 -11
@@ -1756,17 +1756,6 @@ int coroutine_fn blk_co_flush(BlockBackend *blk)return ret; } -int blk_flush (BlockBackend *blk) -{ -int ret; - -blk_inc_in_flight (blk); - ret =blk_do_flush (blk); -blk_dec_in_flight (blk); - -return ret; -} -void blk_drain (BlockBackend *blk) {BlockDriverState *bs =blk_bs (blk);
block/coroutines.h +0 -2
@@ -110,6 +110,4 @@ nbd_do_establish_connection(BlockDriverState *bs, bool blocking, Error **errp); int generated_co_wrapperblk_do_ioctl (BlockBackend *blk,unsigned long int req,void *buf); -int generated_co_wrapper blk_do_flush(BlockBackend *blk); -#endif /* BLOCK_COROUTINES_H */
include/sysemu/block-backend-io.h +1 -1
@@ -165,8 +165,8 @@ int generated_co_wrapper blk_pdiscard(BlockBackend *blk, int64_t offset, int coroutine_fn blk_co_pdiscard(BlockBackend *blk, int64_t offset,int64_t bytes); +int generated_co_wrapper blk_flush(BlockBackend *blk); int coroutine_fn blk_co_flush(BlockBackend *blk); -int blk_flush (BlockBackend *blk);int blk_ioctl (BlockBackend *blk,unsigned long int req,void *buf);
Signature · 1 line
2.35.3
Re: [PATCH 14/18] block: Implement blk_flush() using generated_co_wrapper
Quoted 6 lines · Alberto Faria
Signed-off-by Alberto Faria <[email protected]>--- block/block-backend.c | 11 ----------- block/coroutines.h | 2 -- include/sysemu/block-backend-io.h | 2 +- 3 files changed, 1 insertion(+), 14 deletions(-)
Re: [PATCH 14/18] block: Implement blk_flush() using generated_co_wrapper
In reply to Alberto FariaQuoted 6 lines · Alberto Faria
Signed-off-by Alberto Faria <[email protected]>--- block/block-backend.c | 11 ----------- block/coroutines.h | 2 -- include/sysemu/block-backend-io.h | 2 +- 3 files changed, 1 insertion(+), 14 deletions(-)
PATCH 15/18 block: Add blk_co_ioctl()
In reply to Alberto FariaAlso convert blk_ioctl() into a generated_co_wrapper.
--- block/block-backend.c | 7 ++++--- block/coroutines.h | 6 ------ include/sysemu/block-backend-io.h | 5 ++++- 3 files changed, 8 insertions(+), 10 deletions(-)
block/block-backend.c +4 -3
@@ -1624,7 +1624,7 @@ void blk_aio_cancel_async(BlockAIOCB *acb) }/* To be called between exactly one pair of blk_inc/dec_in_flight() */ -int coroutine_fn +static int coroutine_fnblk_co_do_ioctl (BlockBackend *blk,unsigned long int req,void *buf) {IO_CODE ();
@@ -1638,13 +1638,14 @@ blk_co_do_ioctl(BlockBackend *blk, unsigned long int req, void *buf)return bdrv_co_ioctl (blk_bs (blk), req, buf); } -int blk_ioctl (BlockBackend *blk,unsigned long int req,void *buf) +int coroutine_fn blk_co_ioctl(BlockBackend *blk, unsigned long int req, +void *buf) {int ret;IO_OR_GS_CODE ();blk_inc_in_flight (blk); - ret =blk_do_ioctl (blk, req, buf); + ret =blk_co_do_ioctl (blk, req, buf);blk_dec_in_flight (blk);return ret;
block/coroutines.h +0 -6
@@ -68,9 +68,6 @@ blk_co_do_pwritev_part(BlockBackend *blk, int64_t offset, int64_t bytes, QEMUIOVector *qiov, size_t qiov_offset, BdrvRequestFlags flags); -int coroutine_fn -blk_co_do_ioctl (BlockBackend *blk,unsigned long int req,void *buf); - int coroutine_fnblk_co_do_pdiscard (BlockBackend *blk,int64_t offset,int64_t bytes);
@@ -107,7 +104,4 @@ bdrv_common_block_status_above(BlockDriverState *bs, int generated_co_wrappernbd_do_establish_connection (BlockDriverState *bs,bool blocking,Error **errp); -int generated_co_wrapper -blk_do_ioctl (BlockBackend *blk,unsigned long int req,void *buf); -#endif /* BLOCK_COROUTINES_H */
include/sysemu/block-backend-io.h +4 -1
@@ -168,7 +168,10 @@ int coroutine_fn blk_co_pdiscard(BlockBackend *blk, int64_t offset, int generated_co_wrapper blk_flush(BlockBackend *blk); int coroutine_fn blk_co_flush(BlockBackend *blk); -int blk_ioctl (BlockBackend *blk,unsigned long int req,void *buf); +int generated_co_wrapper blk_ioctl(BlockBackend *blk, unsigned long int req, +void *buf); +int coroutine_fn blk_co_ioctl(BlockBackend *blk, unsigned long int req, +void *buf); int generated_co_wrapper blk_pwrite_compressed(BlockBackend *blk, int64_t offset, int64_t bytes,
Signature · 1 line
2.35.3
Re: [PATCH 15/18] block: Add blk_co_ioctl()
Quoted 8 lines · Alberto Faria
Also convert
blk_ioctl()into agenerated_co_wrapper.Signed-off-by Alberto Faria <[email protected]>--- block/block-backend.c | 7 ++++--- block/coroutines.h | 6 ------ include/sysemu/block-backend-io.h | 5 ++++- 3 files changed, 8 insertions(+), 10 deletions(-)
Re: [PATCH 15/18] block: Add blk_co_ioctl()
In reply to Alberto FariaQuoted 8 lines · Alberto Faria
Also convert
blk_ioctl()into agenerated_co_wrapper.Signed-off-by Alberto Faria <[email protected]>--- block/block-backend.c | 7 ++++--- block/coroutines.h | 6 ------ include/sysemu/block-backend-io.h | 5 ++++- 3 files changed, 8 insertions(+), 10 deletions(-)
PATCH 16/18 block: Add blk_co_truncate()
In reply to Alberto FariaAlso convert blk_truncate() into a generated_co_wrapper.
--- block/block-backend.c | 7 ++++--- include/sysemu/block-backend-io.h | 8 ++++++-- tests/unit/test-block-iothread.c | 14 ++++++++++++++ 3 files changed, 24 insertions(+), 5 deletions(-)
block/block-backend.c +4 -3
@@ -2303,8 +2303,9 @@ int coroutine_fn blk_co_pwrite_compressed(BlockBackend *blk, int64_t offset, BDRV_REQ_WRITE_COMPRESSED); } -int blk_truncate (BlockBackend *blk,int64_t offset,bool exact, -PreallocMode prealloc,BdrvRequestFlags flags,Error **errp) +int coroutine_fn blk_co_truncate(BlockBackend *blk, int64_t offset, bool exact, +PreallocMode prealloc,BdrvRequestFlags flags, +Error **errp) {IO_OR_GS_CODE ();if (!blk_is_available (blk)) {
@@ -2312,7 +2313,7 @@ int blk_truncate(BlockBackend *blk, int64_t offset, bool exact,return -ENOMEDIUM ; } -return bdrv_truncate (blk->root, offset, exact, prealloc, flags, errp); +return bdrv_co_truncate (blk->root, offset, exact, prealloc, flags, errp); } int blk_save_vmstate(BlockBackend *blk, const uint8_t *buf,
include/sysemu/block-backend-io.h +6 -2
@@ -183,7 +183,11 @@ int generated_co_wrapper blk_pwrite_zeroes(BlockBackend *blk, int64_t offset, BdrvRequestFlags flags); int coroutine_fn blk_co_pwrite_zeroes(BlockBackend *blk, int64_t offset,int64_t bytes,BdrvRequestFlags flags); -int blk_truncate (BlockBackend *blk,int64_t offset,bool exact, -PreallocMode prealloc,BdrvRequestFlags flags,Error **errp); +int generated_co_wrapper blk_truncate(BlockBackend *blk, int64_t offset, +bool exact,PreallocMode prealloc, +BdrvRequestFlags flags,Error **errp); +int coroutine_fn blk_co_truncate(BlockBackend *blk, int64_t offset, bool exact, +PreallocMode prealloc,BdrvRequestFlags flags, +Error **errp);#endif /* BLOCK_BACKEND_IO_H */
tests/unit/test-block-iothread.c +14 -0
@@ -298,6 +298,19 @@ static void test_sync_op_truncate(BdrvChild *c) c->bs->open_flags |=BDRV_O_RDWR ; } +static void test_sync_op_blk_truncate (BlockBackend *blk) +{ +int ret; + +/* Normal success path */ + ret =blk_truncate (blk,65536 , false,PREALLOC_MODE_OFF ,0 ,NULL ); + g_assert_cmpint(ret, ==, 0); + +/* Early error: Negative offset */ + ret =blk_truncate (blk,-2 , false,PREALLOC_MODE_OFF ,0 ,NULL ); + g_assert_cmpint(ret, ==, -EINVAL); +} +static void test_sync_op_block_status (BdrvChild *c) {int ret;
@@ -425,6 +438,7 @@ const SyncOpTest sync_op_tests[] = { }, { .name = "/sync-op/truncate", .fn = test_sync_op_truncate, + .blkfn = test_sync_op_blk_truncate, }, { .name = "/sync-op/block_status", .fn = test_sync_op_block_status,
Signature · 1 line
2.35.3
Re: [PATCH 16/18] block: Add blk_co_truncate()
Quoted 8 lines · Alberto Faria
Also convert
blk_truncate()into agenerated_co_wrapper.Signed-off-by Alberto Faria <[email protected]>--- block/block-backend.c | 7 ++++--- include/sysemu/block-backend-io.h | 8 ++++++-- tests/unit/test-block-iothread.c | 14 ++++++++++++++ 3 files changed, 24 insertions(+), 5 deletions(-)
Re: [PATCH 16/18] block: Add blk_co_truncate()
In reply to Alberto FariaQuoted 8 lines · Alberto Faria
Also convert
blk_truncate()into agenerated_co_wrapper.Signed-off-by Alberto Faria <[email protected]>--- block/block-backend.c | 7 ++++--- include/sysemu/block-backend-io.h | 8 ++++++-- tests/unit/test-block-iothread.c | 14 ++++++++++++++ 3 files changed, 24 insertions(+), 5 deletions(-)
PATCH 17/18 block: Reorganize some declarations in block-backend-io.h
In reply to Alberto FariaKeep generated_co_wrapper and coroutine_fn pairs together. This should make it clear that each I/O function has these two versions.
Also move blk_co_{pread,pwrite}()'s implementations out of the header file for consistency.
--- block/block-backend.c | 22 ++++++++ include/sysemu/block-backend-io.h | 87 +++++++++++++------------------ 2 files changed, 59 insertions(+), 50 deletions(-)
block/block-backend.c +22 -0
@@ -1318,6 +1318,17 @@ blk_co_do_preadv_part(BlockBackend *blk, int64_t offset, int64_t bytes,return ret; } +int coroutine_fn blk_co_pread(BlockBackend *blk, int64_t offset, int64_t bytes, +void *buf,BdrvRequestFlags flags) +{ +QEMUIOVector qiov =QEMU_IOVEC_INIT_BUF (qiov, buf, bytes); +IO_OR_GS_CODE (); + +assert (bytes <=SIZE_MAX ); + +return blk_co_preadv (blk, offset, bytes, &qiov, flags); +} + int coroutine_fn blk_co_preadv(BlockBackend *blk, int64_t offset,int64_t bytes,QEMUIOVector *qiov,BdrvRequestFlags flags)
@@ -1399,6 +1410,17 @@ int coroutine_fn blk_co_pwritev_part(BlockBackend *blk, int64_t offset,return ret; } +int coroutine_fn blk_co_pwrite(BlockBackend *blk, int64_t offset, int64_t bytes, +const void *buf,BdrvRequestFlags flags) +{ +QEMUIOVector qiov =QEMU_IOVEC_INIT_BUF (qiov, buf, bytes); +IO_OR_GS_CODE (); + +assert (bytes <=SIZE_MAX ); + +return blk_co_pwritev (blk, offset, bytes, &qiov, flags); +} + int coroutine_fn blk_co_pwritev(BlockBackend *blk, int64_t offset,int64_t bytes,QEMUIOVector *qiov,BdrvRequestFlags flags)
include/sysemu/block-backend-io.h +37 -50
125 lines not on this page · raw message
Signature · 1 line
2.35.3
Re: [PATCH 17/18] block: Reorganize some declarations in block-backend-io.h
Quoted 7 lines · Alberto Faria
Keep
generated_co_wrapperandcoroutine_fnpairs together. This should make it clear that each I/O function has these two versions.Also move blk_co_{pread,pwrite}()'s implementations out of the header file for consistency.
Signed-off-by Alberto Faria <[email protected]>
Quoted 180 lines
--- block/block-backend.c | 22 ++++++++ include/sysemu/block-backend-io.h | 87 +++++++++++++------------------ 2 files changed, 59 insertions(+), 50 deletions(-)block/block-backend.c +22
-0@@ -1318,6 +1318,17 @@ blk_co_do_preadv_part(BlockBackend *blk, int64_t offset, int64_t bytes,return ret; } +int coroutine_fn blk_co_pread(BlockBackend *blk, int64_t offset, int64_t bytes, +void *buf,BdrvRequestFlags flags) +{ +QEMUIOVector qiov =QEMU_IOVEC_INIT_BUF (qiov, buf, bytes); +IO_OR_GS_CODE (); + +assert (bytes <=SIZE_MAX ); + +return blk_co_preadv (blk, offset, bytes, &qiov, flags); +} + int coroutine_fn blk_co_preadv(BlockBackend *blk, int64_t offset,int64_t bytes,QEMUIOVector *qiov,BdrvRequestFlags flags)@@ -1399,6 +1410,17 @@ int coroutine_fn blk_co_pwritev_part(BlockBackend *blk, int64_t offset,return ret; } +int coroutine_fn blk_co_pwrite(BlockBackend *blk, int64_t offset, int64_t bytes, +const void *buf,BdrvRequestFlags flags) +{ +QEMUIOVector qiov =QEMU_IOVEC_INIT_BUF (qiov, buf, bytes); +IO_OR_GS_CODE (); + +assert (bytes <=SIZE_MAX ); + +return blk_co_pwritev (blk, offset, bytes, &qiov, flags); +} + int coroutine_fn blk_co_pwritev(BlockBackend *blk, int64_t offset,int64_t bytes,QEMUIOVector *qiov,BdrvRequestFlags flags)include/sysemu/block-backend-io.h +37
-50@@ -88,11 +88,6 @@ uint32_t blk_get_request_alignment(BlockBackend *blk);uint32_t blk_get_max_transfer (BlockBackend *blk);uint64_t blk_get_max_hw_transfer (BlockBackend *blk); -int coroutine_fn blk_co_copy_range(BlockBackend *blk_in, int64_t off_in, -BlockBackend *blk_out,int64_t off_out, -int64_t bytes,BdrvRequestFlags read_flags, -BdrvRequestFlags write_flags); -/* * "I/O or GS" API functions. These functions can run without @@ -105,9 +100,16 @@ int coroutine_fn blk_co_copy_range(BlockBackend *blk_in, int64_t off_in, int generated_co_wrapper blk_pread(BlockBackend *blk, int64_t offset,int64_t bytes,void *buf,BdrvRequestFlags flags); -int generated_co_wrapper blk_pwrite(BlockBackend *blk, int64_t offset, -int64_t bytes,const void *buf, +int coroutine_fn blk_co_pread(BlockBackend *blk, int64_t offset, int64_t bytes, +void *buf,BdrvRequestFlags flags); + +int generated_co_wrapper blk_preadv(BlockBackend *blk, int64_t offset, +int64_t bytes,QEMUIOVector *qiov,BdrvRequestFlags flags); +int coroutine_fn blk_co_preadv(BlockBackend *blk, int64_t offset, +int64_t bytes,QEMUIOVector *qiov, +BdrvRequestFlags flags); + int generated_co_wrapper blk_preadv_part(BlockBackend *blk, int64_t offset, int64_t bytes, QEMUIOVector *qiov, size_t qiov_offset,@@ -115,12 +117,20 @@ int generated_co_wrapper blk_preadv_part(BlockBackend *blk, int64_t offset, int coroutine_fn blk_co_preadv_part(BlockBackend *blk, int64_t offset,int64_t bytes,QEMUIOVector *qiov,size_t qiov_offset,BdrvRequestFlags flags); -int generated_co_wrapper blk_preadv(BlockBackend *blk, int64_t offset, -int64_t bytes,QEMUIOVector *qiov, + +int generated_co_wrapper blk_pwrite(BlockBackend *blk, int64_t offset, +int64_t bytes,const void *buf,BdrvRequestFlags flags); -int coroutine_fn blk_co_preadv(BlockBackend *blk, int64_t offset, -int64_t bytes,QEMUIOVector *qiov, -BdrvRequestFlags flags); +int coroutine_fn blk_co_pwrite(BlockBackend *blk, int64_t offset, int64_t bytes, +const void *buf,BdrvRequestFlags flags); + +int generated_co_wrapper blk_pwritev(BlockBackend *blk, int64_t offset, +int64_t bytes,QEMUIOVector *qiov, +BdrvRequestFlags flags); +int coroutine_fn blk_co_pwritev(BlockBackend *blk, int64_t offset, +int64_t bytes,QEMUIOVector *qiov, +BdrvRequestFlags flags); + int generated_co_wrapper blk_pwritev_part(BlockBackend *blk, int64_t offset, int64_t bytes, QEMUIOVector *qiov, size_t qiov_offset,@@ -129,36 +139,18 @@ int coroutine_fn blk_co_pwritev_part(BlockBackend *blk, int64_t offset,int64_t bytes, QEMUIOVector *qiov, size_t qiov_offset, BdrvRequestFlags flags); -int generated_co_wrapper blk_pwritev(BlockBackend *blk, int64_t offset, -int64_t bytes,QEMUIOVector *qiov, -BdrvRequestFlags flags); -int coroutine_fn blk_co_pwritev(BlockBackend *blk, int64_t offset, -int64_t bytes,QEMUIOVector *qiov, -BdrvRequestFlags flags); - -static inline int coroutine_fn blk_co_pread(BlockBackend *blk, int64_t offset, -int64_t bytes,void *buf, -BdrvRequestFlags flags) -{ -QEMUIOVector qiov =QEMU_IOVEC_INIT_BUF (qiov, buf, bytes); -IO_OR_GS_CODE (); -assert (bytes <=SIZE_MAX ); - -return blk_co_preadv (blk, offset, bytes, &qiov, flags); -} - -static inline int coroutine_fn blk_co_pwrite(BlockBackend *blk, int64_t offset, -int64_t bytes,const void *buf, -BdrvRequestFlags flags) -{ -QEMUIOVector qiov =QEMU_IOVEC_INIT_BUF (qiov, buf, bytes); -IO_OR_GS_CODE (); - -assert (bytes <=SIZE_MAX ); +int generated_co_wrapper blk_pwrite_compressed(BlockBackend *blk, +int64_t offset,int64_t bytes, +const void *buf); +int coroutine_fn blk_co_pwrite_compressed(BlockBackend *blk, int64_t offset, +int64_t bytes,const void *buf); -return blk_co_pwritev (blk, offset, bytes, &qiov, flags); -} +int generated_co_wrapper blk_pwrite_zeroes(BlockBackend *blk, int64_t offset, +int64_t bytes, +BdrvRequestFlags flags); +int coroutine_fn blk_co_pwrite_zeroes(BlockBackend *blk, int64_t offset, +int64_t bytes,BdrvRequestFlags flags); int generated_co_wrapper blk_pdiscard(BlockBackend *blk, int64_t offset,int64_t bytes);@@ -173,16 +165,6 @@ int generated_co_wrapper blk_ioctl(BlockBackend *blk, unsigned long int req, int coroutine_fn blk_co_ioctl(BlockBackend *blk, unsigned long int req,void *buf); -int generated_co_wrapper blk_pwrite_compressed(BlockBackend *blk, -int64_t offset,int64_t bytes, -const void *buf); -int coroutine_fn blk_co_pwrite_compressed(BlockBackend *blk, int64_t offset, -int64_t bytes,const void *buf); -int generated_co_wrapper blk_pwrite_zeroes(BlockBackend *blk, int64_t offset, -int64_t bytes, -BdrvRequestFlags flags); -int coroutine_fn blk_co_pwrite_zeroes(BlockBackend *blk, int64_t offset, -int64_t bytes,BdrvRequestFlags flags); int generated_co_wrapper blk_truncate(BlockBackend *blk, int64_t offset,bool exact,PreallocMode prealloc,BdrvRequestFlags flags,Error **errp);@@ -190,4 +172,9 @@ int coroutine_fn blk_co_truncate(BlockBackend *blk, int64_t offset, bool exact, PreallocMode prealloc, BdrvRequestFlags flags, Error **errp); +int coroutine_fn blk_co_copy_range(BlockBackend *blk_in, int64_t off_in, +BlockBackend *blk_out,int64_t off_out, +int64_t bytes,BdrvRequestFlags read_flags, +BdrvRequestFlags write_flags); +#endif /* BLOCK_BACKEND_IO_H */
Re: [PATCH 17/18] block: Reorganize some declarations in block-backend-io.h
In reply to Alberto FariaQuoted 11 lines · Alberto Faria
Keep
generated_co_wrapperandcoroutine_fnpairs together. This should make it clear that each I/O function has these two versions.Also move blk_co_{pread,pwrite}()'s implementations out of the header file for consistency.
Signed-off-by Alberto Faria <[email protected]>--- block/block-backend.c | 22 ++++++++ include/sysemu/block-backend-io.h | 87 +++++++++++++------------------ 2 files changed, 59 insertions(+), 50 deletions(-)
[...]
Quoted 16 lines
include/sysemu/block-backend-io.h +0
-5@@ -88,11 +88,6 @@ uint32_t blk_get_request_alignment(BlockBackend *blk);uint32_t blk_get_max_transfer (BlockBackend *blk);uint64_t blk_get_max_hw_transfer (BlockBackend *blk); -int coroutine_fn blk_co_copy_range(BlockBackend *blk_in, int64_t off_in, -BlockBackend *blk_out,int64_t off_out, -int64_t bytes,BdrvRequestFlags read_flags, -BdrvRequestFlags write_flags); -/* * "I/O or GS" API functions. These functions can run without
[...]
include/sysemu/block-backend-io.h int coroutine_fn blk_co_truncate(BlockBackend *blk, int64_t offset, bool exact, · line 180
Quoted 10 lines
include/sysemu/block-backend-io.h +5
-0@@ -190,4 +172,9 @@ int coroutine_fn blk_co_truncate(BlockBackend *blk, int64_t offset, bool exact, PreallocMode prealloc, BdrvRequestFlags flags, Error **errp); +int coroutine_fn blk_co_copy_range(BlockBackend *blk_in, int64_t off_in, +BlockBackend *blk_out,int64_t off_out, +int64_t bytes,BdrvRequestFlags read_flags, +BdrvRequestFlags write_flags); +#endif /* BLOCK_BACKEND_IO_H */
This moves blk_co_copy_range() from the “I/O API functions” section of this header into the “"I/O or GS" API functions” section. Is that intended?
The rest looks good to me, but I wonder about this one function.
Hanna
Re: [PATCH 17/18] block: Reorganize some declarations in block-backend-io.h
Quoted 2 lines · Hanna Reitz
This moves
blk_co_copy_range()from the “I/O API functions” section of this header into the “"I/O or GS" API functions” section. Is that intended?
Oops, thanks, it wasn't intended. Will fix.
Alberto
PATCH 18/18 block: Remove remaining unused symbols in coroutines.h
In reply to Alberto FariaSome can be made static, others are unused generated_co_wrappers.
--- block/block-backend.c | 6 +++--- block/coroutines.h | 19 ------------------- 2 files changed, 3 insertions(+), 22 deletions(-)
block/block-backend.c +3 -3
@@ -1358,7 +1358,7 @@ int coroutine_fn blk_co_preadv_part(BlockBackend *blk, int64_t offset, }/* To be called between exactly one pair of blk_inc/dec_in_flight() */ -int coroutine_fn +static int coroutine_fnblk_co_do_pwritev_part (BlockBackend *blk,int64_t offset,int64_t bytes,QEMUIOVector *qiov,size_t qiov_offset,BdrvRequestFlags flags)
@@ -1691,7 +1691,7 @@ BlockAIOCB *blk_aio_ioctl(BlockBackend *blk, unsigned long int req, void *buf, }/* To be called between exactly one pair of blk_inc/dec_in_flight() */ -int coroutine_fn +static int coroutine_fnblk_co_do_pdiscard (BlockBackend *blk,int64_t offset,int64_t bytes) {int ret;
@@ -1739,7 +1739,7 @@ int coroutine_fn blk_co_pdiscard(BlockBackend *blk, int64_t offset, }/* To be called between exactly one pair of blk_inc/dec_in_flight() */ -int coroutine_fn blk_co_do_flush(BlockBackend *blk) +static int coroutine_fn blk_co_do_flush(BlockBackend *blk) {blk_wait_while_drained (blk);IO_CODE ();
block/coroutines.h +0 -19
@@ -63,17 +63,6 @@ nbd_co_do_establish_connection(BlockDriverState *bs, bool blocking, Error **errp); -int coroutine_fn -blk_co_do_pwritev_part (BlockBackend *blk,int64_t offset,int64_t bytes, -QEMUIOVector *qiov,size_t qiov_offset, -BdrvRequestFlags flags); - -int coroutine_fn -blk_co_do_pdiscard (BlockBackend *blk,int64_t offset,int64_t bytes); - -int coroutine_fn blk_co_do_flush(BlockBackend *blk); - -/* * "I/O or GS" API functions. These functions can run without * the BQL, but only in one specific iothread/main loop.
@@ -82,14 +71,6 @@ int coroutine_fn blk_co_do_flush(BlockBackend *blk);* the "I/O or GS" API. */ -int generated_co_wrapper -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,int64_t bytes, -QEMUIOVector *qiov,BdrvRequestFlags flags); - int generated_co_wrapper bdrv_common_block_status_above(BlockDriverState *bs, BlockDriverState *base,
Signature · 1 line
2.35.3
Re: [PATCH 18/18] block: Remove remaining unused symbols in coroutines.h
Quoted 7 lines · Alberto Faria
Some can be made static, others are unused
generated_co_wrappers.Signed-off-by Alberto Faria <[email protected]>--- block/block-backend.c | 6 +++--- block/coroutines.h | 19 ------------------- 2 files changed, 3 insertions(+), 22 deletions(-)
Re: [PATCH 18/18] block: Remove remaining unused symbols in coroutines.h
In reply to Alberto FariaQuoted 7 lines · Alberto Faria
Some can be made static, others are unused
generated_co_wrappers.Signed-off-by Alberto Faria <[email protected]>--- block/block-backend.c | 6 +++--- block/coroutines.h | 19 ------------------- 2 files changed, 3 insertions(+), 22 deletions(-)
Quoted 10 lines · Alberto Faria
Adjust existing pairs of non-coroutine and coroutine functions to share the same calling convention, and add non-coroutine/coroutine counterparts where they don't exist.
Also make the non-coroutine versions
generated_co_wrappers.This series sits on top of "[PATCH v2 00/10] Implement bdrv_{pread, pwrite,
pwrite_sync, pwrite_zeroes}() usinggenerated_co_wrapper":https://lore.kernel.org/qemu-devel/[email protected]/
Alberto, does this need a rebase?
Paolo
Quoted 64 lines
Based-on: <[email protected]>
Alberto Faria (18):
block: Make blk_{pread,pwrite}() return 0 on success
block: Add a 'flags' param toblk_pread()
block: Change blk_{pread,pwrite}() param order
block: Make 'bytes' param of blk_{pread,pwrite}() anint64_t
block: Makeblk_co_pwrite()take a const buffer
block: Implement blk_{pread,pwrite}() usinggenerated_co_wrapper
block: Add blk_{preadv,pwritev}()
block: Add blk_[co_]preadv_part()
block: Exportblk_pwritev_part()inblock-backend-io.h
block: Changeblk_pwrite_compressed()param order
block: Addblk_co_pwrite_compressed()
block: Implementblk_pwrite_zeroes()usinggenerated_co_wrapper
block: Implementblk_pdiscard()usinggenerated_co_wrapper
block: Implementblk_flush()usinggenerated_co_wrapper
block: Addblk_co_ioctl()
block: Addblk_co_truncate()
block: Reorganize some declarations inblock-backend-io.h
block: Remove remaining unused symbols incoroutines.hblock.c | 10 +- block/block-backend.c | 150 ++++++++++++------------------ block/commit.c | 4 +- block/coroutines.h | 44 --------- block/crypto.c | 2 +- block/export/fuse.c | 4 +- block/meson.build | 1 + block/parallels.c | 2 +- block/qcow.c | 14 +-- block/qcow2.c | 4 +- block/qed.c | 8 +- block/vdi.c | 4 +- block/vhdx.c | 20 ++-- block/vmdk.c | 10 +- block/vpc.c | 12 +-- hw/arm/allwinner-h3.c | 2 +- hw/arm/aspeed.c | 2 +- hw/block/block.c | 2 +- hw/block/fdc.c | 20 ++-- hw/block/hd-geometry.c | 2 +- hw/block/m25p80.c | 2 +- hw/block/nand.c | 47 +++++----- hw/block/onenand.c | 32 +++---- hw/block/pflash_cfi01.c | 4 +- hw/block/pflash_cfi02.c | 4 +- hw/ide/atapi.c | 4 +- hw/misc/mac_via.c | 6 +- hw/misc/sifive_u_otp.c | 14 +-- hw/nvram/eeprom_at24c.c | 8 +- hw/nvram/spapr_nvram.c | 16 ++-- hw/nvram/xlnx-bbram.c | 4 +- hw/nvram/xlnx-efuse.c | 4 +- hw/ppc/pnv_pnor.c | 6 +- hw/sd/sd.c | 4 +- include/sysemu/block-backend-io.h | 105 ++++++++++++--------- migration/block.c | 8 +- nbd/server.c | 8 +- qemu-img.c | 33 +++---- qemu-io-cmds.c | 20 ++-- tests/unit/test-block-iothread.c | 141 ++++++++++++++++++++++++++-- 40 files changed, 433 insertions(+), 354 deletions(-)
Quoted 1 line · Paolo Bonzini
Alberto, does this need a rebase?
This applies cleanly on "[PATCH v5 00/10] Implement bdrv_{pread,pwrite,pwrite_sync,pwrite_zeroes}() using generated_co_wrapper" [1], which applies cleanly to master.
Alberto