From: Dr. David Alan Gilbert <dgilbert@redhat.com>
Date: Thu, 2 Feb 2017 15:59:08 +0000 (+0000)
Subject: Postcopy: Reset state to avoid cleanup assert
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=328d4d85282e7d62f89f5b0547a493d9cd07cea0;p=qemu.git

Postcopy: Reset state to avoid cleanup assert

On a destination host with no userfault support an incoming
postcopy would cause the state to enter ADVISE before
it realised there was no support, and because it was in ADVISE
state it would perform a cleanup at the end.  Since there
was no support the cleanup function should be unreachable,
but ends up being called and asserting.

Reset the state when we realise we have no support, thus the
cleanup doesn't happen.

Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Message-Id: <20170202155909.31784-2-dgilbert@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---

diff --git a/migration/savevm.c b/migration/savevm.c
index 8b8c74dc86..01997687c4 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -1355,6 +1355,7 @@ static int loadvm_postcopy_handle_advise(MigrationIncomingState *mis)
     }
 
     if (!postcopy_ram_supported_by_host()) {
+        postcopy_state_set(POSTCOPY_INCOMING_NONE);
         return -1;
     }