[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 09/25] migration: rename 'pos' field in QEMUFile to 'bytes_process
From: |
Juan Quintela |
Subject: |
[PULL 09/25] migration: rename 'pos' field in QEMUFile to 'bytes_processed' |
Date: |
Wed, 22 Jun 2022 02:25:31 +0200 |
From: Daniel P. Berrangé <berrange@redhat.com>
The field name 'pos' gives the misleading impression that the QEMUFile
objects are seekable. This is not the case, as in general we just
have an opaque stream. The users of this method are only interested
in the total bytes processed. This switches to a new name that
reflects the intended usage.
Every QIOChannel backed impl of QEMUFile is currently ignoring the
'pos' field.
The only QEMUFile impl using 'pos' as an offset for I/O is the block
device vmstate. A later patch is introducing a QIOChannel impl for the
vmstate, and to handle this it is tracking a file offset itself
internally to the QIOChannel impl. So when we later eliminate the
QEMUFileOps callbacks later, the 'pos' field will no longer be used
from any I/O read/write methods.
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
migration/qemu-file.c | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/migration/qemu-file.c b/migration/qemu-file.c
index 03f0b13a55..b21da4c5bf 100644
--- a/migration/qemu-file.c
+++ b/migration/qemu-file.c
@@ -50,8 +50,9 @@ struct QEMUFile {
*/
int64_t rate_limit_used;
- int64_t pos; /* start of buffer when writing, end of buffer
- when reading */
+ /* The sum of bytes transferred on the wire */
+ int64_t total_transferred;
+
int buf_index;
int buf_size; /* 0 when writing */
uint8_t buf[IO_BUF_SIZE];
@@ -241,14 +242,14 @@ void qemu_fflush(QEMUFile *f)
}
if (f->iovcnt > 0) {
expect = iov_size(f->iov, f->iovcnt);
- ret = f->ops->writev_buffer(f->opaque, f->iov, f->iovcnt, f->pos,
+ ret = f->ops->writev_buffer(f->opaque, f->iov, f->iovcnt,
f->total_transferred,
&local_error);
qemu_iovec_release_ram(f);
}
if (ret >= 0) {
- f->pos += ret;
+ f->total_transferred += ret;
}
/* We expect the QEMUFile write impl to send the full
* data set we requested, so sanity check that.
@@ -357,11 +358,11 @@ static ssize_t qemu_fill_buffer(QEMUFile *f)
return 0;
}
- len = f->ops->get_buffer(f->opaque, f->buf + pending, f->pos,
+ len = f->ops->get_buffer(f->opaque, f->buf + pending, f->total_transferred,
IO_BUF_SIZE - pending, &local_error);
if (len > 0) {
f->buf_size += len;
- f->pos += len;
+ f->total_transferred += len;
} else if (len == 0) {
qemu_file_set_error_obj(f, -EIO, local_error);
} else if (len != -EAGAIN) {
@@ -375,7 +376,7 @@ static ssize_t qemu_fill_buffer(QEMUFile *f)
void qemu_update_position(QEMUFile *f, size_t size)
{
- f->pos += size;
+ f->total_transferred += size;
}
/** Closes the file
@@ -658,7 +659,7 @@ int qemu_get_byte(QEMUFile *f)
int64_t qemu_ftell_fast(QEMUFile *f)
{
- int64_t ret = f->pos;
+ int64_t ret = f->total_transferred;
int i;
for (i = 0; i < f->iovcnt; i++) {
@@ -671,7 +672,7 @@ int64_t qemu_ftell_fast(QEMUFile *f)
int64_t qemu_ftell(QEMUFile *f)
{
qemu_fflush(f);
- return f->pos;
+ return f->total_transferred;
}
int qemu_file_rate_limit(QEMUFile *f)
--
2.35.3
- [PULL 04/25] migration: Change zero_copy_send from migration parameter to migration capability, (continued)
- [PULL 04/25] migration: Change zero_copy_send from migration parameter to migration capability, Juan Quintela, 2022/06/21
- [PULL 03/25] QIOChannelSocket: Fix zero-copy send so socket flush works, Juan Quintela, 2022/06/21
- [PULL 05/25] io: add a QIOChannelNull equivalent to /dev/null, Juan Quintela, 2022/06/21
- [PULL 06/25] migration: switch to use QIOChannelNull for dummy channel, Juan Quintela, 2022/06/21
- [PULL 07/25] migration: remove unreachble RDMA code in save_hook impl, Juan Quintela, 2022/06/21
- [PULL 11/25] migration: rename qemu_update_position to qemu_file_credit_transfer, Juan Quintela, 2022/06/21
- [PULL 12/25] migration: rename qemu_file_update_transfer to qemu_file_acct_rate_limit, Juan Quintela, 2022/06/21
- [PULL 14/25] migration: convert savevm to use QIOChannelBlock for VMState, Juan Quintela, 2022/06/21
- [PULL 08/25] migration: rename rate limiting fields in QEMUFile, Juan Quintela, 2022/06/21
- [PULL 10/25] migration: rename qemu_ftell to qemu_file_total_transferred, Juan Quintela, 2022/06/21
- [PULL 09/25] migration: rename 'pos' field in QEMUFile to 'bytes_processed',
Juan Quintela <=
- [PULL 13/25] migration: introduce a QIOChannel impl for BlockDriverState VMState, Juan Quintela, 2022/06/21
- [PULL 15/25] migration: stop passing 'opaque' parameter to QEMUFile hooks, Juan Quintela, 2022/06/21
- [PULL 16/25] migration: hardcode assumption that QEMUFile is backed with QIOChannel, Juan Quintela, 2022/06/21
- [PULL 18/25] migration: remove unused QEMUFileGetFD typedef / qemu_get_fd method, Juan Quintela, 2022/06/21
- [PULL 19/25] migration: remove the QEMUFileOps 'shut_down' callback, Juan Quintela, 2022/06/21
- [PULL 17/25] migration: introduce new constructors for QEMUFile, Juan Quintela, 2022/06/21
- [PULL 20/25] migration: remove the QEMUFileOps 'set_blocking' callback, Juan Quintela, 2022/06/21
- [PULL 21/25] migration: remove the QEMUFileOps 'close' callback, Juan Quintela, 2022/06/21
- [PULL 22/25] migration: remove the QEMUFileOps 'get_buffer' callback, Juan Quintela, 2022/06/21
- [PULL 23/25] migration: remove the QEMUFileOps 'writev_buffer' callback, Juan Quintela, 2022/06/21