Commit 77386127 authored by Lukas Straub's avatar Lukas Straub Committed by Dr. David Alan Gilbert
Browse files

migration/migration.c: Fix hang in ram_save_host_page 



migration_rate_limit will erroneously ratelimit a shutdown socket,
which causes the migration thread to hang in ram_save_host_page
if the socket is shutdown.

Fix this by explicitly testing if the socket has errors or was
shutdown in migration_rate_limit.

Signed-off-by: default avatarLukas Straub <lukasstraub2@web.de>
Message-Id: <e79085bbe2d46dfa007dd41820194d5e2d4fcd80.1590007004.git.lukasstraub2@web.de>
Reviewed-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
parent 4fa8ed25

migration/migration.c

+4 −0
Original line number Diff line number Diff line
@@ -3361,6 +3361,10 @@ bool migration_rate_limit(void) 
    bool urgent = false;

    migration_update_counters(s, now);

    if (qemu_file_rate_limit(s->to_dst_file)) {



        if (qemu_file_get_error(s->to_dst_file)) {

            return false;

        }

        /*

         * Wait for a delay to do rate limiting OR

         * something urgent to post the semaphore.