SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

migration: No save_live_pending() method uses the QEMUFile parameter

Browse Source 
So remove it everywhere.

Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
Juan Quintela 2022-10-02 23:17:49 +02:00
parent 301d7ffe5f
commit 255dc7af7e
9 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/s390x/s390-stattrib.c
View File

@ -182,7 +182,7 @@ static int cmma_save_setup(QEMUFile *f, void *opaque)
return 0; return 0;
} }
static void cmma_save_pending(QEMUFile *f, void *opaque, uint64_t max_size, static void cmma_save_pending(void *opaque, uint64_t max_size,
uint64_t *res_precopy_only, uint64_t *res_precopy_only,
uint64_t *res_compatible, uint64_t *res_compatible,
uint64_t *res_postcopy_only) uint64_t *res_postcopy_only)

2
hw/vfio/migration.c
View File

@ -456,7 +456,7 @@ static void vfio_save_cleanup(void *opaque)
trace_vfio_save_cleanup(vbasedev->name); trace_vfio_save_cleanup(vbasedev->name);
} }
static void vfio_save_pending(QEMUFile *f, void *opaque, static void vfio_save_pending(void *opaque,
uint64_t threshold_size, uint64_t threshold_size,
uint64_t *res_precopy_only, uint64_t *res_precopy_only,
uint64_t *res_compatible, uint64_t *res_compatible,

2
include/migration/register.h
View File

@ -46,7 +46,7 @@ typedef struct SaveVMHandlers {
/* This runs outside the iothread lock! */ /* This runs outside the iothread lock! */
int (*save_setup)(QEMUFile *f, void *opaque); int (*save_setup)(QEMUFile *f, void *opaque);
void (*save_live_pending)(QEMUFile *f, void *opaque, void (*save_live_pending)(void *opaque,
uint64_t threshold_size, uint64_t threshold_size,
uint64_t *res_precopy_only, uint64_t *res_precopy_only,
uint64_t *res_compatible, uint64_t *res_compatible,

2
migration/block-dirty-bitmap.c
View File

@ -762,7 +762,7 @@ static int dirty_bitmap_save_complete(QEMUFile *f, void *opaque)
return 0; return 0;
} }
static void dirty_bitmap_save_pending(QEMUFile *f, void *opaque, static void dirty_bitmap_save_pending(void *opaque,
uint64_t max_size, uint64_t max_size,
uint64_t *res_precopy_only, uint64_t *res_precopy_only,
uint64_t *res_compatible, uint64_t *res_compatible,

2
migration/block.c
View File

@ -863,7 +863,7 @@ static int block_save_complete(QEMUFile *f, void *opaque)
return 0; return 0;
} }
static void block_save_pending(QEMUFile *f, void *opaque, uint64_t max_size, static void block_save_pending(void *opaque, uint64_t max_size,
uint64_t *res_precopy_only, uint64_t *res_precopy_only,
uint64_t *res_compatible, uint64_t *res_compatible,
uint64_t *res_postcopy_only) uint64_t *res_postcopy_only)

2
migration/migration.c
View File

@ -3781,7 +3781,7 @@ static MigIterateState migration_iteration_run(MigrationState *s)
uint64_t pending_size, pend_pre, pend_compat, pend_post; uint64_t pending_size, pend_pre, pend_compat, pend_post;
bool in_postcopy = s->state == MIGRATION_STATUS_POSTCOPY_ACTIVE; bool in_postcopy = s->state == MIGRATION_STATUS_POSTCOPY_ACTIVE;
qemu_savevm_state_pending(s->to_dst_file, s->threshold_size, &pend_pre, qemu_savevm_state_pending(s->threshold_size, &pend_pre,
&pend_compat, &pend_post); &pend_compat, &pend_post);
pending_size = pend_pre + pend_compat + pend_post; pending_size = pend_pre + pend_compat + pend_post;

2
migration/ram.c
View File

@ -3409,7 +3409,7 @@ static int ram_save_complete(QEMUFile *f, void *opaque)
return 0; return 0;
} }
static void ram_save_pending(QEMUFile *f, void *opaque, uint64_t max_size, static void ram_save_pending(void *opaque, uint64_t max_size,
uint64_t *res_precopy_only, uint64_t *res_precopy_only,
uint64_t *res_compatible, uint64_t *res_compatible,
uint64_t *res_postcopy_only) uint64_t *res_postcopy_only)

4
migration/savevm.c
View File

@ -1472,7 +1472,7 @@ flush:
* the result is split into the amount for units that can and * the result is split into the amount for units that can and
* for units that can't do postcopy. * for units that can't do postcopy.
*/ */
void qemu_savevm_state_pending(QEMUFile *f, uint64_t threshold_size, void qemu_savevm_state_pending(uint64_t threshold_size,
uint64_t *res_precopy_only, uint64_t *res_precopy_only,
uint64_t *res_compatible, uint64_t *res_compatible,
uint64_t *res_postcopy_only) uint64_t *res_postcopy_only)
@ -1493,7 +1493,7 @@ void qemu_savevm_state_pending(QEMUFile *f, uint64_t threshold_size,
continue; continue;
} }
} }
se->ops->save_live_pending(f, se->opaque, threshold_size, se->ops->save_live_pending(se->opaque, threshold_size,
res_precopy_only, res_compatible, res_precopy_only, res_compatible,
res_postcopy_only); res_postcopy_only);
} }

2
migration/savevm.h
View File

@ -40,7 +40,7 @@ void qemu_savevm_state_cleanup(void);
void qemu_savevm_state_complete_postcopy(QEMUFile *f); void qemu_savevm_state_complete_postcopy(QEMUFile *f);
int qemu_savevm_state_complete_precopy(QEMUFile *f, bool iterable_only, int qemu_savevm_state_complete_precopy(QEMUFile *f, bool iterable_only,
bool inactivate_disks); bool inactivate_disks);
void qemu_savevm_state_pending(QEMUFile *f, uint64_t max_size, void qemu_savevm_state_pending(uint64_t max_size,
uint64_t *res_precopy_only, uint64_t *res_precopy_only,
uint64_t *res_compatible, uint64_t *res_compatible,
uint64_t *res_postcopy_only); uint64_t *res_postcopy_only);