[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 27/38] qemu-file: Don't increment qemu_file_transferred at qemu_fi
From: |
Juan Quintela |
Subject: |
[PULL 27/38] qemu-file: Don't increment qemu_file_transferred at qemu_file_fill_buffer |
Date: |
Tue, 31 Oct 2023 10:01:31 +0100 |
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.
Reviewed-by: Fabiano Rosas <farosas@suse.de>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Message-ID: <20231025091117.6342-2-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
- [PULL 18/38] migration/ram: Fix compilation with -Wshadow=local, (continued)
- [PULL 18/38] migration/ram: Fix compilation with -Wshadow=local, Juan Quintela, 2023/10/31
- [PULL 13/38] migration: Create compress_update_rates(), Juan Quintela, 2023/10/31
- [PULL 19/38] migration: rename vmstate_save_needed->vmstate_section_needed, Juan Quintela, 2023/10/31
- [PULL 20/38] migration: set file error on subsection loading, Juan Quintela, 2023/10/31
- [PULL 21/38] qemu-iotests: Filter warnings about block migration being deprecated, Juan Quintela, 2023/10/31
- [PULL 16/38] migration: Merge flush_compressed_data() and compress_flush_data(), Juan Quintela, 2023/10/31
- [PULL 17/38] migration: Rename ram_compressed_pages() to compress_ram_pages(), Juan Quintela, 2023/10/31
- [PULL 22/38] migration: migrate 'inc' command option is deprecated., Juan Quintela, 2023/10/31
- [PULL 23/38] migration: migrate 'blk' command option is deprecated., Juan Quintela, 2023/10/31
- [PULL 26/38] migration: Stop migration immediately in RDMA error paths, Juan Quintela, 2023/10/31
- [PULL 27/38] qemu-file: Don't increment qemu_file_transferred at qemu_file_fill_buffer,
Juan Quintela <=
- [PULL 29/38] qemu_file: total_transferred is not used anymore, Juan Quintela, 2023/10/31
- [PULL 25/38] migration: Deprecate old compression method, Juan Quintela, 2023/10/31
- [PULL 24/38] migration: Deprecate block migration, Juan Quintela, 2023/10/31
- [PULL 28/38] qemu_file: Use a stat64 for qemu_file_transferred, Juan Quintela, 2023/10/31
- [PULL 32/38] qemu-file: Remove _noflush from qemu_file_transferred_noflush(), Juan Quintela, 2023/10/31
- [PULL 34/38] migration: migration_rate_limit_reset() don't need the QEMUFile, Juan Quintela, 2023/10/31
- [PULL 30/38] migration: Use the number of transferred bytes directly, Juan Quintela, 2023/10/31
- [PULL 33/38] migration: migration_transferred_bytes() don't need the QEMUFile, Juan Quintela, 2023/10/31
- [PULL 36/38] migration: Use migration_transferred_bytes(), Juan Quintela, 2023/10/31
- [PULL 31/38] qemu_file: Remove unused qemu_file_transferred(), Juan Quintela, 2023/10/31