|
 |
4a2fec |
From 21133ce1a56f6490a7ea9dd107013088c1fc05ed Mon Sep 17 00:00:00 2001
|
|
|
4a2fec |
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
|
|
|
4a2fec |
Date: Thu, 2 Nov 2017 15:36:56 +0100
|
|
|
4a2fec |
Subject: [PATCH 3/9] migration: Reset rather than destroy
|
|
|
4a2fec |
main_thread_load_event
|
|
|
4a2fec |
|
|
|
4a2fec |
RH-Author: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
4a2fec |
Message-id: <20171102153657.13452-2-dgilbert@redhat.com>
|
|
|
4a2fec |
Patchwork-id: 77481
|
|
|
4a2fec |
O-Subject: [RHEL-7.5 qemu-kvm-rhev PATCH 1/2] migration: Reset rather than destroy main_thread_load_event
|
|
|
4a2fec |
Bugzilla: 1508799
|
|
|
4a2fec |
RH-Acked-by: Peter Xu <peterx@redhat.com>
|
|
|
4a2fec |
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
|
|
4a2fec |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
4a2fec |
|
|
|
4a2fec |
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
|
|
|
4a2fec |
|
|
|
4a2fec |
migration_incoming_state_destroy doesn't really destroy, it cleans up.
|
|
|
4a2fec |
After a loadvm it's called, but the loadvm command can be run twice,
|
|
|
4a2fec |
and so destroying an init-once mutex breaks on the second loadvm.
|
|
|
4a2fec |
|
|
|
4a2fec |
Reported-by: Stafford Horne <shorne@gmail.com>
|
|
|
4a2fec |
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
4a2fec |
Message-Id: <20170825141940.20740-2-dgilbert@redhat.com>
|
|
|
4a2fec |
Reviewed-by: Peter Xu <peterx@redhat.com>
|
|
|
4a2fec |
Tested-by: Stafford Horne <shorne@gmail.com>
|
|
|
4a2fec |
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
4a2fec |
(cherry picked from commit 5089e1862fe80b6f23ba4c494e2902cbe3d9d48e)
|
|
|
4a2fec |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
4a2fec |
---
|
|
|
4a2fec |
migration/migration.c | 2 +-
|
|
|
4a2fec |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
4a2fec |
|
|
|
4a2fec |
diff --git a/migration/migration.c b/migration/migration.c
|
|
|
4a2fec |
index 1288697..cd33718 100644
|
|
|
4a2fec |
--- a/migration/migration.c
|
|
|
4a2fec |
+++ b/migration/migration.c
|
|
|
4a2fec |
@@ -172,7 +172,7 @@ void migration_incoming_state_destroy(void)
|
|
|
4a2fec |
mis->from_src_file = NULL;
|
|
|
4a2fec |
}
|
|
|
4a2fec |
|
|
|
4a2fec |
- qemu_event_destroy(&mis->main_thread_load_event);
|
|
|
4a2fec |
+ qemu_event_reset(&mis->main_thread_load_event);
|
|
|
4a2fec |
}
|
|
|
4a2fec |
|
|
|
4a2fec |
static void migrate_generate_event(int new_state)
|
|
|
4a2fec |
--
|
|
|
4a2fec |
1.8.3.1
|
|
|
4a2fec |
|