From: "Dr. David Alan Gilbert (git)" <dgilbert@redhat.com>
To: qemu-devel@nongnu.org, peterx@redhat.com
Cc: quintela@redhat.com
Subject: [PULL 1/1] Revert "migration: Properly destroy variables on incoming side"
Date: Mon, 28 Sep 2020 16:20:24 +0100 [thread overview]
Message-ID: <20200928152024.209894-2-dgilbert@redhat.com> (raw)
In-Reply-To: <20200928152024.209894-1-dgilbert@redhat.com>
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
next prev parent reply other threads:[~2020-09-28 15:23 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-28 15:20 [PULL 0/1] migration queue Dr. David Alan Gilbert (git)
2020-09-28 15:20 ` Dr. David Alan Gilbert (git) [this message]
2020-09-28 15:51 ` [PULL 1/1] Revert "migration: Properly destroy variables on incoming side" Peter Xu
2020-09-29 10:10 ` [PULL 0/1] migration queue Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200928152024.209894-2-dgilbert@redhat.com \
--to=dgilbert@redhat.com \
--cc=peterx@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).