mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-09-06 01:43:39 +00:00
migration: rename qemu_update_position to qemu_file_credit_transfer
The qemu_update_position method name gives the misleading impression that it is changing the current file offset. Most of the files are just streams, however, so there's no concept of a file offset in the general case. What this method is actually used for is to report on the number of bytes that have been transferred out of band from the main I/O methods. This new name better reflects this purpose. 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> Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
parent
fbfa6404e5
commit
1a93bd2f60
|
@ -319,7 +319,7 @@ size_t ram_control_save_page(QEMUFile *f, ram_addr_t block_offset,
|
|||
if (ret != RAM_SAVE_CONTROL_DELAYED &&
|
||||
ret != RAM_SAVE_CONTROL_NOT_SUPP) {
|
||||
if (bytes_sent && *bytes_sent > 0) {
|
||||
qemu_update_position(f, *bytes_sent);
|
||||
qemu_file_credit_transfer(f, *bytes_sent);
|
||||
} else if (ret < 0) {
|
||||
qemu_file_set_error(f, ret);
|
||||
}
|
||||
|
@ -374,7 +374,7 @@ static ssize_t qemu_fill_buffer(QEMUFile *f)
|
|||
return len;
|
||||
}
|
||||
|
||||
void qemu_update_position(QEMUFile *f, size_t size)
|
||||
void qemu_file_credit_transfer(QEMUFile *f, size_t size)
|
||||
{
|
||||
f->total_transferred += size;
|
||||
}
|
||||
|
|
|
@ -179,7 +179,14 @@ int qemu_put_qemu_file(QEMUFile *f_des, QEMUFile *f_src);
|
|||
*/
|
||||
int qemu_peek_byte(QEMUFile *f, int offset);
|
||||
void qemu_file_skip(QEMUFile *f, int size);
|
||||
void qemu_update_position(QEMUFile *f, size_t size);
|
||||
/*
|
||||
* qemu_file_credit_transfer:
|
||||
*
|
||||
* Report on a number of bytes that have been transferred
|
||||
* out of band from the main file object I/O methods. This
|
||||
* accounting information tracks the total migration traffic.
|
||||
*/
|
||||
void qemu_file_credit_transfer(QEMUFile *f, size_t size);
|
||||
void qemu_file_reset_rate_limit(QEMUFile *f);
|
||||
void qemu_file_update_transfer(QEMUFile *f, int64_t len);
|
||||
void qemu_file_set_rate_limit(QEMUFile *f, int64_t new_rate);
|
||||
|
|
|
@ -2301,7 +2301,7 @@ void acct_update_position(QEMUFile *f, size_t size, bool zero)
|
|||
} else {
|
||||
ram_counters.normal += pages;
|
||||
ram_transferred_add(size);
|
||||
qemu_update_position(f, size);
|
||||
qemu_file_credit_transfer(f, size);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue