[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 01/12] qemu-file: Don't increment qemu_file_transferred at qem
From: |
Juan Quintela |
Subject: |
[PATCH v2 01/12] qemu-file: Don't increment qemu_file_transferred at qemu_file_fill_buffer |
Date: |
Wed, 25 Oct 2023 11:11:06 +0200 |
We only call qemu_file_transferred_* on the sending side. Remove the
increment at qemu_file_fill_buffer() and add asserts to
qemu_file_transferred* functions.
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
migration/qemu-file.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/migration/qemu-file.c b/migration/qemu-file.c
index 3fb25148d1..6814c562e6 100644
--- a/migration/qemu-file.c
+++ b/migration/qemu-file.c
@@ -337,7 +337,6 @@ static ssize_t coroutine_mixed_fn qemu_fill_buffer(QEMUFile
*f)
if (len > 0) {
f->buf_size += len;
- f->total_transferred += len;
} else if (len == 0) {
qemu_file_set_error_obj(f, -EIO, local_error);
} else {
@@ -627,6 +626,8 @@ uint64_t qemu_file_transferred_noflush(QEMUFile *f)
uint64_t ret = f->total_transferred;
int i;
+ g_assert(qemu_file_is_writable(f));
+
for (i = 0; i < f->iovcnt; i++) {
ret += f->iov[i].iov_len;
}
@@ -636,6 +637,7 @@ uint64_t qemu_file_transferred_noflush(QEMUFile *f)
uint64_t qemu_file_transferred(QEMUFile *f)
{
+ g_assert(qemu_file_is_writable(f));
qemu_fflush(f);
return f->total_transferred;
}
--
2.41.0
- [PATCH v2 00/12] migration: Yet another round of atomic counters, Juan Quintela, 2023/10/25
- [PATCH v2 02/12] qemu_file: Use a stat64 for qemu_file_transferred, Juan Quintela, 2023/10/25
- [PATCH v2 05/12] qemu_file: Remove unused qemu_file_transferred(), Juan Quintela, 2023/10/25
- [PATCH v2 06/12] qemu-file: Remove _noflush from qemu_file_transferred_noflush(), Juan Quintela, 2023/10/25
- [PATCH v2 01/12] qemu-file: Don't increment qemu_file_transferred at qemu_file_fill_buffer,
Juan Quintela <=
- [PATCH v2 07/12] migration: migration_transferred_bytes() don't need the QEMUFile, Juan Quintela, 2023/10/25
- [PATCH v2 08/12] migration: migration_rate_limit_reset() don't need the QEMUFile, Juan Quintela, 2023/10/25
- [PATCH v2 10/12] migration: Use migration_transferred_bytes(), Juan Quintela, 2023/10/25
- [PATCH v2 11/12] migration: Remove transferred atomic counter, Juan Quintela, 2023/10/25
- [PATCH v2 09/12] qemu-file: Simplify qemu_file_get_error(), Juan Quintela, 2023/10/25
- [PATCH v2 04/12] migration: Use the number of transferred bytes directly, Juan Quintela, 2023/10/25
- [PATCH v2 03/12] qemu_file: total_transferred is not used anymore, Juan Quintela, 2023/10/25
- [PATCH v2 12/12] qemu-file: Make qemu_fflush() return errors, Juan Quintela, 2023/10/25