ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qemu-file: Remove total from qemu_file_total_transferred_*() 

Function is already quite long.

Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Message-Id: <20230508130909.65420-7-quintela@redhat.com>
This commit is contained in:
Juan Quintela 2023-05-08 15:08:54 +02:00
parent f87e4d6d43
commit 6da835d42a
6 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
migration/block.c
View File

@ -747,7 +747,7 @@ static int block_save_setup(QEMUFile *f, void *opaque)
static int block_save_iterate(QEMUFile *f, void *opaque) static int block_save_iterate(QEMUFile *f, void *opaque)
{ {
int ret; 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, trace_migration_block_save("iterate", block_mig_state.submitted,
block_mig_state.transferred); 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); 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); return (delta_bytes > 0);
} }

2
migration/migration.c
View File

@ -2648,7 +2648,7 @@ static MigThrError migration_detect_error(MigrationState *s)
/* How many bytes have we transferred since the beginning of the migration */ /* How many bytes have we transferred since the beginning of the migration */
static uint64_t migration_total_bytes(MigrationState *s) 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); stat64_get(&mig_stats.multifd_bytes);
} }

4
migration/qemu-file.c
View File

@ -709,7 +709,7 @@ int coroutine_mixed_fn qemu_get_byte(QEMUFile *f)
return result; 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; uint64_t ret = f->total_transferred;
int i; int i;
@ -721,7 +721,7 @@ uint64_t qemu_file_total_transferred_fast(QEMUFile *f)
return ret; return ret;
} }
uint64_t qemu_file_total_transferred(QEMUFile *f) uint64_t qemu_file_transferred(QEMUFile *f)
{ {
qemu_fflush(f); qemu_fflush(f);
return f->total_transferred; return f->total_transferred;

10
migration/qemu-file.h
View File

@ -68,7 +68,7 @@ void qemu_file_set_hooks(QEMUFile *f, const QEMUFileHooks *hooks);
int qemu_fclose(QEMUFile *f); int qemu_fclose(QEMUFile *f);
/* /*
* qemu_file_total_transferred: * qemu_file_transferred:
* *
* Report the total number of bytes transferred with * Report the total number of bytes transferred with
* this file. * this file.
@ -83,19 +83,19 @@ int qemu_fclose(QEMUFile *f);
* *
* Returns: the total bytes transferred * 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 * files, where no flush is performed and the reported
* amount will include the size of any queued buffers, * amount will include the size of any queued buffers,
* on top of the amount actually transferred. * on top of the amount actually transferred.
* *
* Returns: the total bytes transferred and queued * 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. * put_buffer without copying the buffer.

6
migration/savevm.c
View File

@ -927,9 +927,9 @@ static int vmstate_load(QEMUFile *f, SaveStateEntry *se)
static void vmstate_save_old_style(QEMUFile *f, SaveStateEntry *se, static void vmstate_save_old_style(QEMUFile *f, SaveStateEntry *se,
JSONWriter *vmdesc) 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); 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) { if (vmdesc) {
json_writer_int64(vmdesc, "size", size); json_writer_int64(vmdesc, "size", size);
@ -2956,7 +2956,7 @@ bool save_snapshot(const char *name, bool overwrite, const char *vmstate,
goto the_end; goto the_end;
} }
ret = qemu_savevm_state(f, errp); 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); ret2 = qemu_fclose(f);
if (ret < 0) { if (ret < 0) {
goto the_end; goto the_end;

5
migration/vmstate.c
View File

@ -361,7 +361,7 @@ int vmstate_save_state_v(QEMUFile *f, const VMStateDescription *vmsd,
void *curr_elem = first_elem + size * i; void *curr_elem = first_elem + size * i;
vmsd_desc_field_start(vmsd, vmdesc_loop, field, i, n_elems); 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) { if (field->flags & VMS_ARRAY_OF_POINTER) {
assert(curr_elem); assert(curr_elem);
curr_elem = *(void **)curr_elem; curr_elem = *(void **)curr_elem;
@ -391,8 +391,7 @@ int vmstate_save_state_v(QEMUFile *f, const VMStateDescription *vmsd,
return ret; return ret;
} }
written_bytes = qemu_file_total_transferred_fast(f) - written_bytes = qemu_file_transferred_fast(f) - old_offset;
old_offset;
vmsd_desc_field_end(vmsd, vmdesc_loop, field, written_bytes, i); vmsd_desc_field_end(vmsd, vmdesc_loop, field, written_bytes, i);
/* Compressed arrays only care about the first element */ /* Compressed arrays only care about the first element */