Commit fb14a42a authored by Dr. David Alan Gilbert's avatar Dr. David Alan Gilbert
Browse files

migration: Don't try and recover return path in non-postcopy



In normal precopy we can't do reconnection recovery - but we also
don't need to, since you can just rerun migration.
At the moment if the 'return-path' capability is on, we use
the return path in precopy to give a positive 'OK' to the end
of migration; however if migration fails then we fall into
the postcopy recovery path and hang.  This fixes it by only
running the return path in the postcopy case.

Reported-by: default avatarGreg Kurz <groug@kaod.org>
Tested-by: default avatarGreg Kurz <groug@kaod.org>
Reviewed-by: default avatarPeter Xu <peterx@redhat.com>
Signed-off-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
parent 694ea274
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -2486,7 +2486,7 @@ retry:
out:
    res = qemu_file_get_error(rp);
    if (res) {
        if (res == -EIO) {
        if (res == -EIO && migration_in_postcopy()) {
            /*
             * Maybe there is something we can do: it looks like a
             * network down issue, and we pause for a recovery.