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

qemu-file: Remove _noflush from qemu_file_transferred_noflush()

Browse Source 
qemu_file_transferred() don't exist anymore, so we can reuse the name.

Reviewed-by: Fabiano Rosas <farosas@suse.de>
Signed-off-by: Juan Quintela <quintela@redhat.com>

Message-ID: <20231025091117.6342-7-quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
This commit is contained in:
Juan Quintela 2023-10-25 11:11:11 +02:00
parent e833cad7e7
commit e9c0eed7c2
5 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
migration/block.c
View File

@ -755,7 +755,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_transferred_noflush(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);
@ -807,7 +807,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_transferred_noflush(f) - last_bytes; uint64_t delta_bytes = qemu_file_transferred(f) - last_bytes;
return (delta_bytes > 0); return (delta_bytes > 0);
} }

2
migration/qemu-file.c
View File

@ -618,7 +618,7 @@ int coroutine_mixed_fn qemu_get_byte(QEMUFile *f)
return result; 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); uint64_t ret = stat64_get(&mig_stats.qemu_file_transferred);
int i; int i;

9
migration/qemu-file.h
View File

@ -34,15 +34,14 @@ QEMUFile *qemu_file_new_output(QIOChannel *ioc);
int qemu_fclose(QEMUFile *f); int qemu_fclose(QEMUFile *f);
/* /*
* qemu_file_transferred_noflush: * qemu_file_transferred:
* *
* As qemu_file_transferred except for writable files, where no flush * No flush is performed and the reported amount will include the size
* is performed and the reported amount will include the size of any * of any queued buffers, on top of the amount actually transferred.
* queued buffers, 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_transferred_noflush(QEMUFile *f); uint64_t qemu_file_transferred(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_transferred_noflush(f); uint64_t old_offset = qemu_file_transferred(f);
se->ops->save_state(f, se->opaque); 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) { if (vmdesc) {
json_writer_int64(vmdesc, "size", size); json_writer_int64(vmdesc, "size", size);
@ -3053,7 +3053,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_transferred_noflush(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;

4
migration/vmstate.c
View File

@ -387,7 +387,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_transferred_noflush(f); old_offset = qemu_file_transferred(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;
@ -417,7 +417,7 @@ int vmstate_save_state_v(QEMUFile *f, const VMStateDescription *vmsd,
return ret; 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); 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 */