| Message ID | 20231024151042.90349-7-quintela@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | migration: Yet another round of atomic counters | expand |
Juan Quintela <quintela@redhat.com> writes: > qemu_file_transferred() don't exist anymore, so we can reuse the name. > > Signed-off-by: Juan Quintela <quintela@redhat.com> > > --- > > v2: Update the documentation (thanks fabiano) > --- > migration/qemu-file.h | 9 ++++----- > migration/block.c | 4 ++-- > migration/qemu-file.c | 2 +- > migration/savevm.c | 6 +++--- > migration/vmstate.c | 4 ++-- > 5 files changed, 12 insertions(+), 13 deletions(-) > > diff --git a/migration/qemu-file.h b/migration/qemu-file.h > index 8b71152754..1b2f6b8d8f 100644 > --- a/migration/qemu-file.h > +++ b/migration/qemu-file.h > @@ -34,15 +34,14 @@ QEMUFile *qemu_file_new_output(QIOChannel *ioc); > int qemu_fclose(QEMUFile *f); > > /* > - * qemu_file_transferred_noflush: > + * qemu_file_transferred: > * > - * 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. > + * 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_transferred_noflush(QEMUFile *f); > +uint64_t qemu_file_transferred(QEMUFile *f); > > /* > * put_buffer without copying the buffer. > diff --git a/migration/block.c b/migration/block.c > index b60698d6e2..47f11d0e4f 100644 > --- a/migration/block.c > +++ b/migration/block.c > @@ -752,7 +752,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_transferred_noflush(f); > + uint64_t last_bytes = qemu_file_transferred(f); > > trace_migration_block_save("iterate", block_mig_state.submitted, > block_mig_state.transferred); > @@ -804,7 +804,7 @@ static int block_save_iterate(QEMUFile *f, void *opaque) > } > > qemu_put_be64(f, BLK_MIG_FLAG_EOS); > - uint64_t delta_bytes = qemu_file_transferred_noflush(f) - last_bytes; > + uint64_t delta_bytes = qemu_file_transferred(f) - last_bytes; > return (delta_bytes > 0); > } > > diff --git a/migration/qemu-file.c b/migration/qemu-file.c > index efa5f11033..0158db2a54 100644 > --- a/migration/qemu-file.c > +++ b/migration/qemu-file.c > @@ -618,7 +618,7 @@ int coroutine_mixed_fn qemu_get_byte(QEMUFile *f) > return result; > } > > -uint64_t qemu_file_transferred_noflush(QEMUFile *f) > +uint64_t qemu_file_transferred(QEMUFile *f) > { > uint64_t ret = stat64_get(&mig_stats.qemu_file_transferred); > int i; > diff --git a/migration/savevm.c b/migration/savevm.c > index 8622f229e5..9c90499609 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_transferred_noflush(f); > + uint64_t old_offset = qemu_file_transferred(f); > se->ops->save_state(f, se->opaque); > - uint64_t size = qemu_file_transferred_noflush(f) - old_offset; > + uint64_t size = qemu_file_transferred(f) - old_offset; > > if (vmdesc) { > json_writer_int64(vmdesc, "size", size); > @@ -3053,7 +3053,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_transferred_noflush(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 1cf9e45b85..16420fa9a3 100644 > --- a/migration/vmstate.c > +++ b/migration/vmstate.c > @@ -386,7 +386,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_transferred_noflush(f); > + old_offset = qemu_file_transferred(f); > if (field->flags & VMS_ARRAY_OF_POINTER) { > assert(curr_elem); > curr_elem = *(void **)curr_elem; > @@ -416,7 +416,7 @@ int vmstate_save_state_v(QEMUFile *f, const VMStateDescription *vmsd, > return ret; > } > > - written_bytes = qemu_file_transferred_noflush(f) - old_offset; > + written_bytes = qemu_file_transferred(f) - old_offset; > vmsd_desc_field_end(vmsd, vmdesc_loop, field, written_bytes, i); > > /* Compressed arrays only care about the first element */ Reviewed-by: Fabiano Rosas <farosas@suse.de>
diff --git a/migration/qemu-file.h b/migration/qemu-file.h index 8b71152754..1b2f6b8d8f 100644 --- a/migration/qemu-file.h +++ b/migration/qemu-file.h @@ -34,15 +34,14 @@ QEMUFile *qemu_file_new_output(QIOChannel *ioc); int qemu_fclose(QEMUFile *f); /* - * qemu_file_transferred_noflush: + * qemu_file_transferred: * - * 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. + * 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_transferred_noflush(QEMUFile *f); +uint64_t qemu_file_transferred(QEMUFile *f); /* * put_buffer without copying the buffer. diff --git a/migration/block.c b/migration/block.c index b60698d6e2..47f11d0e4f 100644 --- a/migration/block.c +++ b/migration/block.c @@ -752,7 +752,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_transferred_noflush(f); + uint64_t last_bytes = qemu_file_transferred(f); trace_migration_block_save("iterate", block_mig_state.submitted, block_mig_state.transferred); @@ -804,7 +804,7 @@ static int block_save_iterate(QEMUFile *f, void *opaque) } qemu_put_be64(f, BLK_MIG_FLAG_EOS); - uint64_t delta_bytes = qemu_file_transferred_noflush(f) - last_bytes; + uint64_t delta_bytes = qemu_file_transferred(f) - last_bytes; return (delta_bytes > 0); } diff --git a/migration/qemu-file.c b/migration/qemu-file.c index efa5f11033..0158db2a54 100644 --- a/migration/qemu-file.c +++ b/migration/qemu-file.c @@ -618,7 +618,7 @@ int coroutine_mixed_fn qemu_get_byte(QEMUFile *f) return result; } -uint64_t qemu_file_transferred_noflush(QEMUFile *f) +uint64_t qemu_file_transferred(QEMUFile *f) { uint64_t ret = stat64_get(&mig_stats.qemu_file_transferred); int i; diff --git a/migration/savevm.c b/migration/savevm.c index 8622f229e5..9c90499609 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_transferred_noflush(f); + uint64_t old_offset = qemu_file_transferred(f); se->ops->save_state(f, se->opaque); - uint64_t size = qemu_file_transferred_noflush(f) - old_offset; + uint64_t size = qemu_file_transferred(f) - old_offset; if (vmdesc) { json_writer_int64(vmdesc, "size", size); @@ -3053,7 +3053,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_transferred_noflush(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 1cf9e45b85..16420fa9a3 100644 --- a/migration/vmstate.c +++ b/migration/vmstate.c @@ -386,7 +386,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_transferred_noflush(f); + old_offset = qemu_file_transferred(f); if (field->flags & VMS_ARRAY_OF_POINTER) { assert(curr_elem); curr_elem = *(void **)curr_elem; @@ -416,7 +416,7 @@ int vmstate_save_state_v(QEMUFile *f, const VMStateDescription *vmsd, return ret; } - written_bytes = qemu_file_transferred_noflush(f) - old_offset; + written_bytes = qemu_file_transferred(f) - old_offset; vmsd_desc_field_end(vmsd, vmdesc_loop, field, written_bytes, i); /* Compressed arrays only care about the first element */
qemu_file_transferred() don't exist anymore, so we can reuse the name. Signed-off-by: Juan Quintela <quintela@redhat.com> --- v2: Update the documentation (thanks fabiano) --- migration/qemu-file.h | 9 ++++----- migration/block.c | 4 ++-- migration/qemu-file.c | 2 +- migration/savevm.c | 6 +++--- migration/vmstate.c | 4 ++-- 5 files changed, 12 insertions(+), 13 deletions(-)