Until previous commit, save_live_pending() was used for ram. Now with
the split into state_pending_estimate() and state_pending_exact() it
is not needed anymore, so remove them.
Signed-off-by: Juan Quintela <quint...@redhat.com>
---
include/migration/register.h | 7 +++----
migration/savevm.h | 6 ++----
hw/vfio/migration.c | 6 +++---
migration/block-dirty-bitmap.c | 3 +--
migration/block.c | 3 +--
migration/migration.c | 4 ++--
migration/ram.c | 6 ++----
migration/savevm.c | 12 ++++--------
8 files changed, 18 insertions(+), 29 deletions(-)
diff --git a/include/migration/register.h b/include/migration/register.h
index 313b8e1c3b..5f08204fb2 100644
--- a/include/migration/register.h
+++ b/include/migration/register.h
@@ -58,11 +58,10 @@ typedef struct SaveVMHandlers {
* pending data.
*/
/* This calculate the exact remaining data to transfer */
- void (*state_pending_exact)(void *opaque, uint64_t threshold_size,
- uint64_t *rest_precopy, uint64_t
*rest_postcopy);
+ void (*state_pending_exact)(void *opaque, uint64_t *rest_precopy,
+ uint64_t *rest_postcopy);
/* This estimates the remaining data to transfer */
- void (*state_pending_estimate)(void *opaque, uint64_t threshold_size,
- uint64_t *rest_precopy,
+ void (*state_pending_estimate)(void *opaque, uint64_t *rest_precopy,
uint64_t *rest_postcopy);
LoadStateHandler *load_state;
diff --git a/migration/savevm.h b/migration/savevm.h
index 613f85e717..24f2d2a28b 100644
--- a/migration/savevm.h
+++ b/migration/savevm.h
@@ -40,11 +40,9 @@ void qemu_savevm_state_cleanup(void);
void qemu_savevm_state_complete_postcopy(QEMUFile *f);
int qemu_savevm_state_complete_precopy(QEMUFile *f, bool iterable_only,
bool inactivate_disks);
-void qemu_savevm_state_pending_exact(uint64_t max_size,
- uint64_t *res_precopy,
+void qemu_savevm_state_pending_exact(uint64_t *res_precopy,
uint64_t *res_postcopy);
-void qemu_savevm_state_pending_estimate(uint64_t max_size,
- uint64_t *res_precopy,
+void qemu_savevm_state_pending_estimate(uint64_t *res_precopy,
uint64_t *res_postcopy);
void qemu_savevm_send_ping(QEMUFile *f, uint32_t value);
void qemu_savevm_send_open_return_path(QEMUFile *f);
diff --git a/hw/vfio/migration.c b/hw/vfio/migration.c
index 680cf4df6e..d9598ce070 100644
--- a/hw/vfio/migration.c
+++ b/hw/vfio/migration.c
@@ -456,8 +456,8 @@ static void vfio_save_cleanup(void *opaque)
trace_vfio_save_cleanup(vbasedev->name);
}
-static void vfio_state_pending(void *opaque, uint64_t threshold_size,
- uint64_t *res_precopy, uint64_t *res_postcopy)
+static void vfio_state_pending(void *opaque, uint64_t *res_precopy,
+ uint64_t *res_postcopy)
{
VFIODevice *vbasedev = opaque;
VFIOMigration *migration = vbasedev->migration;
@@ -511,7 +511,7 @@ static int vfio_save_iterate(QEMUFile *f, void *opaque)
}
/*
- * Reset pending_bytes as .save_live_pending is not called during savevm or
+ * Reset pending_bytes as .state_pending_* is not called during savevm or
* snapshot case, in such case vfio_update_pending() at the start of this
* function updates pending_bytes.
*/
diff --git a/migration/block-dirty-bitmap.c b/migration/block-dirty-bitmap.c
index 5b24007650..8a11577252 100644
--- a/migration/block-dirty-bitmap.c
+++ b/migration/block-dirty-bitmap.c
@@ -761,8 +761,7 @@ static int dirty_bitmap_save_complete(QEMUFile *f, void
*opaque)
return 0;
}
-static void dirty_bitmap_state_pending(void *opaque, uint64_t max_size,
- uint64_t *res_precopy,
+static void dirty_bitmap_state_pending(void *opaque, uint64_t *res_precopy,
uint64_t *res_postcopy)
{
DBMSaveState *s = &((DBMState *)opaque)->save;
diff --git a/migration/block.c b/migration/block.c
index 8e6ad1c468..4f1f7c0f8d 100644
--- a/migration/block.c
+++ b/migration/block.c
@@ -862,8 +862,7 @@ static int block_save_complete(QEMUFile *f, void *opaque)
return 0;
}
-static void block_state_pending(void *opaque, uint64_t max_size,
- uint64_t *res_precopy,
+static void block_state_pending(void *opaque, uint64_t *res_precopy,
uint64_t *res_postcopy)
{
/* Estimate pending number of bytes to send */
diff --git a/migration/migration.c b/migration/migration.c
index 4676568699..97fefd579e 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -3737,12 +3737,12 @@ static MigIterateState
migration_iteration_run(MigrationState *s)
uint64_t pend_pre, pend_post;
bool in_postcopy = s->state == MIGRATION_STATUS_POSTCOPY_ACTIVE;
- qemu_savevm_state_pending_estimate(s->threshold_size, &pend_pre,
&pend_post);
+ qemu_savevm_state_pending_estimate(&pend_pre, &pend_post);
uint64_t pending_size = pend_pre + pend_post;
trace_migrate_pending_estimate(pending_size, s->threshold_size, pend_pre,
pend_post);
if (pend_pre <= s->threshold_size) {
- qemu_savevm_state_pending_exact(s->threshold_size, &pend_pre,
&pend_post);
+ qemu_savevm_state_pending_exact(&pend_pre, &pend_post);
pending_size = pend_pre + pend_post;
trace_migrate_pending_exact(pending_size, s->threshold_size, pend_pre,
pend_post);
}
diff --git a/migration/ram.c b/migration/ram.c
index 8d989d51db..53a5dd64a8 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -3434,8 +3434,7 @@ static int ram_save_complete(QEMUFile *f, void *opaque)
return 0;
}
-static void ram_state_pending_estimate(void *opaque, uint64_t max_size,
- uint64_t *res_precopy,
+static void ram_state_pending_estimate(void *opaque, uint64_t *res_precopy,
uint64_t *res_postcopy)
{
RAMState **temp = opaque;
@@ -3451,8 +3450,7 @@ static void ram_state_pending_estimate(void *opaque,
uint64_t max_size,
}
}
-static void ram_state_pending_exact(void *opaque, uint64_t max_size,
- uint64_t *res_precopy,
+static void ram_state_pending_exact(void *opaque, uint64_t *res_precopy,
uint64_t *res_postcopy)
{
RAMState **temp = opaque;
diff --git a/migration/savevm.c b/migration/savevm.c
index 976ece3f3f..1e0328e088 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -1471,8 +1471,7 @@ flush:
* the result is split into the amount for units that can and
* for units that can't do postcopy.
*/
-void qemu_savevm_state_pending_exact(uint64_t threshold_size,
- uint64_t *res_precopy,
+void qemu_savevm_state_pending_exact(uint64_t *res_precopy,
uint64_t *res_postcopy)
{
SaveStateEntry *se;
@@ -1489,13 +1488,11 @@ void qemu_savevm_state_pending_exact(uint64_t
threshold_size,
continue;
}
}
- se->ops->state_pending_exact(se->opaque, threshold_size,
- res_precopy, res_postcopy);
+ se->ops->state_pending_exact(se->opaque, res_precopy, res_postcopy);
}
}
-void qemu_savevm_state_pending_estimate(uint64_t threshold_size,
- uint64_t *res_precopy,
+void qemu_savevm_state_pending_estimate(uint64_t *res_precopy,
uint64_t *res_postcopy)
{
SaveStateEntry *se;
@@ -1512,8 +1509,7 @@ void qemu_savevm_state_pending_estimate(uint64_t
threshold_size,
continue;
}
}
- se->ops->state_pending_estimate(se->opaque, threshold_size,
- res_precopy, res_postcopy);
+ se->ops->state_pending_estimate(se->opaque, res_precopy, res_postcopy);
}
}
--
2.37.2
