* Wei Yang (richardw.y...@linux.intel.com) wrote:
> For migration incoming side, it either quit in precopy or postcopy. It
> is safe to use the mis->bh for both instead of allocating a dedicated
> QEMUBH for postcopy.
>
> Signed-off-by: Wei Yang <richardw.y...@linux.intel.com>
> Reviewed-by: Dr. David Alan Gilbert <dgilb...@redhat.com>
Hi Wei,
Can you check this, the patchew tests came back with a failure which
seems bh related; I've not tried it, but can you just see if you can
reproduce it?
Dave
> ---
> v3: rebase on latest upstream
> v2: fix a typo in change log
> ---
> migration/savevm.c | 17 ++++-------------
> 1 file changed, 4 insertions(+), 13 deletions(-)
>
> diff --git a/migration/savevm.c b/migration/savevm.c
> index 621b6c0465..9bf9d2e5fe 100644
> --- a/migration/savevm.c
> +++ b/migration/savevm.c
> @@ -1867,16 +1867,10 @@ static int
> loadvm_postcopy_handle_listen(MigrationIncomingState *mis)
> return 0;
> }
>
> -
> -typedef struct {
> - QEMUBH *bh;
> -} HandleRunBhData;
> -
> static void loadvm_postcopy_handle_run_bh(void *opaque)
> {
> Error *local_err = NULL;
> - HandleRunBhData *data = opaque;
> - MigrationIncomingState *mis = migration_incoming_get_current();
> + MigrationIncomingState *mis = opaque;
>
> /* TODO we should move all of this lot into postcopy_ram.c or a shared
> code
> * in migration.c
> @@ -1908,15 +1902,13 @@ static void loadvm_postcopy_handle_run_bh(void
> *opaque)
> runstate_set(RUN_STATE_PAUSED);
> }
>
> - qemu_bh_delete(data->bh);
> - g_free(data);
> + qemu_bh_delete(mis->bh);
> }
>
> /* After all discards we can start running and asking for pages */
> static int loadvm_postcopy_handle_run(MigrationIncomingState *mis)
> {
> PostcopyState ps = postcopy_state_set(POSTCOPY_INCOMING_RUNNING);
> - HandleRunBhData *data;
>
> trace_loadvm_postcopy_handle_run();
> if (ps != POSTCOPY_INCOMING_LISTENING) {
> @@ -1924,9 +1916,8 @@ static int
> loadvm_postcopy_handle_run(MigrationIncomingState *mis)
> return -1;
> }
>
> - data = g_new(HandleRunBhData, 1);
> - data->bh = qemu_bh_new(loadvm_postcopy_handle_run_bh, data);
> - qemu_bh_schedule(data->bh);
> + mis->bh = qemu_bh_new(loadvm_postcopy_handle_run_bh, mis);
> + qemu_bh_schedule(mis->bh);
>
> /* We need to finish reading the stream from the package
> * and also stop reading anything more from the stream that loaded the
> --
> 2.17.1
>
>
--
Dr. David Alan Gilbert / dgilb...@redhat.com / Manchester, UK
