[PULL 0/1] migration queue

[PULL 0/1] migration queue

[Dr. David Alan Gilbert (git)]

From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>

The following changes since commit 8d16e72f2d4df2c9e631393adf1669a1da7efe8a:

  Merge remote-tracking branch 'remotes/dgilbert/tags/pull-migration-20200925a' into staging (2020-09-25 14:46:18 +0100)

are available in the Git repository at:

  git://github.com/dagrh/qemu.git tags/pull-migration-20200928a

for you to fetch changes up to 1783c00fc998220f9ca13b7eeca1d610243bc11b:

  Revert "migration: Properly destroy variables on incoming side" (2020-09-28 16:18:02 +0100)

----------------------------------------------------------------
Migration: Revert one patch for 068 fix

One patch in the last pull broke test 068 which
does a pair of vmload's.

Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

----------------------------------------------------------------
Dr. David Alan Gilbert (1):
      Revert "migration: Properly destroy variables on incoming side"

 migration/migration.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

[PULL 1/1] Revert "migration: Properly destroy variables on incoming side"

[Dr. David Alan Gilbert (git)]

From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>

This reverts commit c02039a6f3730ddcf683a0ba9a175688c6db71a0.

This is breaking test 068 that does a loadvm twice.

Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
 migration/migration.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/migration/migration.c b/migration/migration.c
index 838ca79f57..aca7fdcd0b 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -238,15 +238,12 @@ void migration_incoming_state_destroy(void)
         mis->postcopy_remote_fds = NULL;
     }
 
+    qemu_event_reset(&mis->main_thread_load_event);
+
     if (mis->socket_address_list) {
         qapi_free_SocketAddressList(mis->socket_address_list);
         mis->socket_address_list = NULL;
     }
-
-    qemu_event_destroy(&mis->main_thread_load_event);
-    qemu_sem_destroy(&mis->postcopy_pause_sem_dst);
-    qemu_sem_destroy(&mis->postcopy_pause_sem_fault);
-    qemu_mutex_destroy(&mis->rp_mutex);
 }
 
 static void migrate_generate_event(int new_state)
-- 
2.26.2

Re: [PULL 1/1] Revert "migration: Properly destroy variables on incoming side"

[Peter Xu]

On Mon, Sep 28, 2020 at 04:20:24PM +0100, Dr. David Alan Gilbert (git) wrote:
> From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
> 
> This reverts commit c02039a6f3730ddcf683a0ba9a175688c6db71a0.
> 
> This is breaking test 068 that does a loadvm twice.

This is exactly something I'm afraid of happening... :-(

Though for the long term in the future, ideally maybe we should just forbid
loadvm for more than once (restarting a QEMU instance won't hurt, afaict, or we
really need to be careful on the whole loadvm path, I'm not sure whether
there's any other spots that we didn't notice that won't allow reentrance), or
we should provide some reset helper, so that we won't only destroy partially in
the destroy helper.

-- 
Peter Xu

Re: [PULL 0/1] migration queue

[Peter Maydell]

On Mon, 28 Sep 2020 at 16:23, Dr. David Alan Gilbert (git)
<dgilbert@redhat.com> wrote:
>
> From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
>
> The following changes since commit 8d16e72f2d4df2c9e631393adf1669a1da7efe8a:
>
>   Merge remote-tracking branch 'remotes/dgilbert/tags/pull-migration-20200925a' into staging (2020-09-25 14:46:18 +0100)
>
> are available in the Git repository at:
>
>   git://github.com/dagrh/qemu.git tags/pull-migration-20200928a
>
> for you to fetch changes up to 1783c00fc998220f9ca13b7eeca1d610243bc11b:
>
>   Revert "migration: Properly destroy variables on incoming side" (2020-09-28 16:18:02 +0100)
>
> ----------------------------------------------------------------
> Migration: Revert one patch for 068 fix
>
> One patch in the last pull broke test 068 which
> does a pair of vmload's.
>
> Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
>
> ----------------------------------------------------------------
> Dr. David Alan Gilbert (1):
>       Revert "migration: Properly destroy variables on incoming side"


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/5.2
for any user-visible changes.

-- PMM