[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 05/20] migration: rename 'pos' field in QEMUFile to 'bytes_proces
From: |
Daniel P . Berrangé |
Subject: |
[PATCH 05/20] migration: rename 'pos' field in QEMUFile to 'bytes_processed' |
Date: |
Tue, 24 May 2022 12:02:20 +0100 |
This makes the field name align with the newly introduced method
names in the previous commit.
Signed-off-by: Daniel P. Berrangé <berrange@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.36.1
- [PATCH 00/20] migration: remove QEMUFileOps concept and assume use of QIOChannel, Daniel P . Berrangé, 2022/05/24
- [PATCH 06/20] migration: rename qemu_ftell to qemu_file_total_transferred, Daniel P . Berrangé, 2022/05/24
- [PATCH 07/20] migration: rename qemu_update_position to qemu_file_credit_transfer, Daniel P . Berrangé, 2022/05/24
- [PATCH 08/20] migration: introduce a QIOChannel impl for BlockDriverState VMState, Daniel P . Berrangé, 2022/05/24
- [PATCH 02/20] migration: switch to use QIOChannelNull for dummy channel, Daniel P . Berrangé, 2022/05/24
- [PATCH 01/20] io: add a QIOChannelNull equivalent to /dev/null, Daniel P . Berrangé, 2022/05/24
- [PATCH 05/20] migration: rename 'pos' field in QEMUFile to 'bytes_processed',
Daniel P . Berrangé <=
- [PATCH 10/20] migration: stop passing 'opaque' parameter to QEMUFile hooks, Daniel P . Berrangé, 2022/05/24
- [PATCH 04/20] migration: rename rate limiting fields in QEMUFile, Daniel P . Berrangé, 2022/05/24
- [PATCH 13/20] migration: remove unused QEMUFileGetFD typedef, Daniel P . Berrangé, 2022/05/24
- [PATCH 03/20] migration: remove unreachble RDMA code in save_hook impl, Daniel P . Berrangé, 2022/05/24
- [PATCH 09/20] migration: convert savevm to use QIOChannelBlock for VMState, Daniel P . Berrangé, 2022/05/24
- [PATCH 19/20] migration: remove the QEMUFileOps 'get_return_path' callback, Daniel P . Berrangé, 2022/05/24
- [PATCH 12/20] migration: introduce new constructors for QEMUFile, Daniel P . Berrangé, 2022/05/24
- [PATCH 11/20] migration: hardcode assumption that QEMUFile is backed with QIOChannel, Daniel P . Berrangé, 2022/05/24
- [PATCH 14/20] migration: remove the QEMUFileOps 'shut_down' callback, Daniel P . Berrangé, 2022/05/24