OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

qemu-file: Account for rate_limit usage on qemu_fflush()

Browse Source 
That is the moment we know we have transferred something.

Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Message-Id: <20230515195709.63843-5-quintela@redhat.com>
This commit is contained in:
Juan Quintela 2023-05-15 21:56:57 +02:00
parent 8e4b2a7059
commit de37f8b9c2
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
migration/qemu-file.c
View File

@ -302,7 +302,9 @@ void qemu_fflush(QEMUFile *f)
&local_error) < 0) { &local_error) < 0) {
qemu_file_set_error_obj(f, -EIO, local_error); qemu_file_set_error_obj(f, -EIO, local_error);
} else { } else {
f->total_transferred += iov_size(f->iov, f->iovcnt); uint64_t size = iov_size(f->iov, f->iovcnt);
qemu_file_acct_rate_limit(f, size);
f->total_transferred += size;
} }
qemu_iovec_release_ram(f); qemu_iovec_release_ram(f);
@ -519,7 +521,6 @@ void qemu_put_buffer_async(QEMUFile *f, const uint8_t *buf, size_t size,
return; return;
} }
f->rate_limit_used += size;
add_to_iovec(f, buf, size, may_free); add_to_iovec(f, buf, size, may_free);
} }
@ -537,7 +538,6 @@ void qemu_put_buffer(QEMUFile *f, const uint8_t *buf, size_t size)
l = size; l = size;
} }
memcpy(f->buf + f->buf_index, buf, l); memcpy(f->buf + f->buf_index, buf, l);
f->rate_limit_used += l;
add_buf_to_iovec(f, l); add_buf_to_iovec(f, l);
if (qemu_file_get_error(f)) { if (qemu_file_get_error(f)) {
break; break;
@ -554,7 +554,6 @@ void qemu_put_byte(QEMUFile *f, int v)
} }
f->buf[f->buf_index] = v; f->buf[f->buf_index] = v;
f->rate_limit_used++;
add_buf_to_iovec(f, 1); add_buf_to_iovec(f, 1);
} }