diff options
| author | Fiona Ebner | 2022-10-13 10:41:00 +0200 |
|---|---|---|
| committer | Juan Quintela | 2022-11-21 11:56:12 +0100 |
| commit | a216ec85b78ea96b51950665879524132f6e678c (patch) | |
| tree | 24b6bee13b6ed8408215b01e2f4340e0384dfa0c | |
| parent | Merge tag 'pull-ppc-20221117' of https://gitlab.com/danielhb/qemu into staging (diff) | |
| download | qemu-a216ec85b78ea96b51950665879524132f6e678c.tar.gz qemu-a216ec85b78ea96b51950665879524132f6e678c.tar.xz qemu-a216ec85b78ea96b51950665879524132f6e678c.zip | |
migration/channel-block: fix return value for qio_channel_block_{readv,writev}
in the error case. The documentation in include/io/channel.h states
that -1 or QIO_CHANNEL_ERR_BLOCK should be returned upon error. Simply
passing along the return value from the bdrv-functions has the
potential to confuse the call sides. Non-blocking mode is not
implemented currently, so -1 it is.
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
| -rw-r--r-- | migration/channel-block.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/migration/channel-block.c b/migration/channel-block.c index c55c8c93ce..f4ab53acdb 100644 --- a/migration/channel-block.c +++ b/migration/channel-block.c @@ -62,7 +62,8 @@ qio_channel_block_readv(QIOChannel *ioc, qemu_iovec_init_external(&qiov, (struct iovec *)iov, niov); ret = bdrv_readv_vmstate(bioc->bs, &qiov, bioc->offset); if (ret < 0) { - return ret; + error_setg_errno(errp, -ret, "bdrv_readv_vmstate failed"); + return -1; } bioc->offset += qiov.size; @@ -86,7 +87,8 @@ qio_channel_block_writev(QIOChannel *ioc, qemu_iovec_init_external(&qiov, (struct iovec *)iov, niov); ret = bdrv_writev_vmstate(bioc->bs, &qiov, bioc->offset); if (ret < 0) { - return ret; + error_setg_errno(errp, -ret, "bdrv_writev_vmstate failed"); + return -1; } bioc->offset += qiov.size; |