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

qemu-file: Rename qemu_file_transferred_ fast -> noflush 

Fast don't say much.  Noflush indicates more clearly that it is like
qemu_file_transferred but without the flush.

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20230530183941.7223-2-quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
This commit is contained in:
Juan Quintela 2023-05-30 20:39:22 +02:00
parent 06c48d6b37
commit fc95c63b60
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
migration/qemu-file.c
View File

@ -694,7 +694,7 @@ int coroutine_mixed_fn qemu_get_byte(QEMUFile *f)
return result; return result;
} }
uint64_t qemu_file_transferred_fast(QEMUFile *f) uint64_t qemu_file_transferred_noflush(QEMUFile *f)
{ {
uint64_t ret = f->total_transferred; uint64_t ret = f->total_transferred;
int i; int i;

11
migration/qemu-file.h
View File

@ -86,16 +86,15 @@ int qemu_fclose(QEMUFile *f);
uint64_t qemu_file_transferred(QEMUFile *f); uint64_t qemu_file_transferred(QEMUFile *f);
/* /*
* qemu_file_transferred_fast: * qemu_file_transferred_noflush:
* *
* As qemu_file_transferred except for writable * As qemu_file_transferred except for writable files, where no flush
* files, where no flush is performed and the reported * is performed and the reported amount will include the size of any
* amount will include the size of any queued buffers, * 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_transferred_fast(QEMUFile *f); uint64_t qemu_file_transferred_noflush(QEMUFile *f);
/* /*
* put_buffer without copying the buffer. * put_buffer without copying the buffer.

4
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_fast(f); uint64_t old_offset = qemu_file_transferred_noflush(f);
se->ops->save_state(f, se->opaque); se->ops->save_state(f, se->opaque);
uint64_t size = qemu_file_transferred_fast(f) - old_offset; uint64_t size = qemu_file_transferred_noflush(f) - old_offset;
if (vmdesc) { if (vmdesc) {
json_writer_int64(vmdesc, "size", size); json_writer_int64(vmdesc, "size", size);

4
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_transferred_fast(f); old_offset = qemu_file_transferred_noflush(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,7 +391,7 @@ int vmstate_save_state_v(QEMUFile *f, const VMStateDescription *vmsd,
return ret; return ret;
} }
written_bytes = qemu_file_transferred_fast(f) - old_offset; written_bytes = qemu_file_transferred_noflush(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 */