On 5/8/23 15:08, Juan Quintela wrote:
> Function is already quite long.
>
> Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
C.
> ---
> migration/block.c | 4 ++--
> migration/migration.c | 2 +-
> migration/qemu-file.c | 4 ++--
> migration/qemu-file.h | 10 +++++-----
> migration/savevm.c | 6 +++---
> migration/vmstate.c | 5 ++---
> 6 files changed, 15 insertions(+), 16 deletions(-)
>
> diff --git a/migration/block.c b/migration/block.c
> index a37678ce95..12617b4152 100644
> --- a/migration/block.c
> +++ b/migration/block.c
> @@ -747,7 +747,7 @@ static int block_save_setup(QEMUFile *f, void *opaque)
> static int block_save_iterate(QEMUFile *f, void *opaque)
> {
> int ret;
> - uint64_t last_bytes = qemu_file_total_transferred(f);
> + uint64_t last_bytes = qemu_file_transferred(f);
>
> trace_migration_block_save("iterate", block_mig_state.submitted,
> block_mig_state.transferred);
> @@ -799,7 +799,7 @@ static int block_save_iterate(QEMUFile *f, void *opaque)
> }
>
> qemu_put_be64(f, BLK_MIG_FLAG_EOS);
> - uint64_t delta_bytes = qemu_file_total_transferred(f) - last_bytes;
> + uint64_t delta_bytes = qemu_file_transferred(f) - last_bytes;
> return (delta_bytes > 0);
> }
>
> diff --git a/migration/migration.c b/migration/migration.c
> index e17a6538b4..b1cfb56523 100644
> --- a/migration/migration.c
> +++ b/migration/migration.c
> @@ -2621,7 +2621,7 @@ static MigThrError migration_detect_error(MigrationState *s)
> /* How many bytes have we transferred since the beginning of the migration */
> static uint64_t migration_total_bytes(MigrationState *s)
> {
> - return qemu_file_total_transferred(s->to_dst_file) +
> + return qemu_file_transferred(s->to_dst_file) +
> stat64_get(&mig_stats.multifd_bytes);
> }
>
> diff --git a/migration/qemu-file.c b/migration/qemu-file.c
> index f3cb0cd94f..6ebc2bd3ec 100644
> --- a/migration/qemu-file.c
> +++ b/migration/qemu-file.c
> @@ -709,7 +709,7 @@ int coroutine_mixed_fn qemu_get_byte(QEMUFile *f)
> return result;
> }
>
> -uint64_t qemu_file_total_transferred_fast(QEMUFile *f)
> +uint64_t qemu_file_transferred_fast(QEMUFile *f)
> {
> uint64_t ret = f->total_transferred;
> int i;
> @@ -721,7 +721,7 @@ uint64_t qemu_file_total_transferred_fast(QEMUFile *f)
> return ret;
> }
>
> -uint64_t qemu_file_total_transferred(QEMUFile *f)
> +uint64_t qemu_file_transferred(QEMUFile *f)
> {
> qemu_fflush(f);
> return f->total_transferred;
> diff --git a/migration/qemu-file.h b/migration/qemu-file.h
> index d758e7f10b..ab164a58d0 100644
> --- a/migration/qemu-file.h
> +++ b/migration/qemu-file.h
> @@ -68,7 +68,7 @@ void qemu_file_set_hooks(QEMUFile *f, const QEMUFileHooks *hooks);
> int qemu_fclose(QEMUFile *f);
>
> /*
> - * qemu_file_total_transferred:
> + * qemu_file_transferred:
> *
> * Report the total number of bytes transferred with
> * this file.
> @@ -83,19 +83,19 @@ int qemu_fclose(QEMUFile *f);
> *
> * Returns: the total bytes transferred
> */
> -uint64_t qemu_file_total_transferred(QEMUFile *f);
> +uint64_t qemu_file_transferred(QEMUFile *f);
>
> /*
> - * qemu_file_total_transferred_fast:
> + * qemu_file_transferred_fast:
> *
> - * As qemu_file_total_transferred except for writable
> + * As qemu_file_transferred except for writable
> * files, where no flush is performed and the reported
> * amount will include the size of any queued buffers,
> * on top of the amount actually transferred.
> *
> * Returns: the total bytes transferred and queued
> */
> -uint64_t qemu_file_total_transferred_fast(QEMUFile *f);
> +uint64_t qemu_file_transferred_fast(QEMUFile *f);
>
> /*
> * put_buffer without copying the buffer.
> diff --git a/migration/savevm.c b/migration/savevm.c
> index 032044b1d5..e33788343a 100644
> --- a/migration/savevm.c
> +++ b/migration/savevm.c
> @@ -927,9 +927,9 @@ static int vmstate_load(QEMUFile *f, SaveStateEntry *se)
> static void vmstate_save_old_style(QEMUFile *f, SaveStateEntry *se,
> JSONWriter *vmdesc)
> {
> - uint64_t old_offset = qemu_file_total_transferred_fast(f);
> + uint64_t old_offset = qemu_file_transferred_fast(f);
> se->ops->save_state(f, se->opaque);
> - uint64_t size = qemu_file_total_transferred_fast(f) - old_offset;
> + uint64_t size = qemu_file_transferred_fast(f) - old_offset;
>
> if (vmdesc) {
> json_writer_int64(vmdesc, "size", size);
> @@ -2956,7 +2956,7 @@ bool save_snapshot(const char *name, bool overwrite, const char *vmstate,
> goto the_end;
> }
> ret = qemu_savevm_state(f, errp);
> - vm_state_size = qemu_file_total_transferred(f);
> + vm_state_size = qemu_file_transferred(f);
> ret2 = qemu_fclose(f);
> if (ret < 0) {
> goto the_end;
> diff --git a/migration/vmstate.c b/migration/vmstate.c
> index 351f56104e..af01d54b6f 100644
> --- a/migration/vmstate.c
> +++ b/migration/vmstate.c
> @@ -361,7 +361,7 @@ int vmstate_save_state_v(QEMUFile *f, const VMStateDescription *vmsd,
> void *curr_elem = first_elem + size * i;
>
> vmsd_desc_field_start(vmsd, vmdesc_loop, field, i, n_elems);
> - old_offset = qemu_file_total_transferred_fast(f);
> + old_offset = qemu_file_transferred_fast(f);
> if (field->flags & VMS_ARRAY_OF_POINTER) {
> assert(curr_elem);
> curr_elem = *(void **)curr_elem;
> @@ -391,8 +391,7 @@ int vmstate_save_state_v(QEMUFile *f, const VMStateDescription *vmsd,
> return ret;
> }
>
> - written_bytes = qemu_file_total_transferred_fast(f) -
> - old_offset;
> + written_bytes = qemu_file_transferred_fast(f) - old_offset;
> vmsd_desc_field_end(vmsd, vmdesc_loop, field, written_bytes, i);
>
> /* Compressed arrays only care about the first element */