Commit eab0ebc7 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20151203' into staging 



migration/next for 20151203

# gpg: Signature made Wed 02 Dec 2015 23:19:10 GMT using RSA key ID 5872D723
# gpg: Good signature from "Juan Quintela <quintela@redhat.com>"
# gpg:                 aka "Juan Quintela <quintela@trasno.org>"

* remotes/juanquintela/tags/migration/20151203:
  migration: do floating-point division
  migration: Clean up use of g_poll() in socket_writev_buffer()

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents ec1b9aa8 a694ee34

migration/migration.c

+1 −1
Original line number Diff line number Diff line
@@ -1674,7 +1674,7 @@ static void *migration_thread(void *opaque) 
        if (current_time >= initial_time + BUFFER_DELAY) {

            uint64_t transferred_bytes = qemu_ftell(s->file) - initial_bytes;

            uint64_t time_spent = current_time - initial_time;

            double bandwidth = transferred_bytes / time_spent;

            double bandwidth = (double)transferred_bytes / time_spent;

            max_size = bandwidth * migrate_max_downtime() / 1000000;



            s->mbps = time_spent ? (((double) transferred_bytes * 8.0) /

migration/qemu-file-unix.c

+2 −1
Original line number Diff line number Diff line
@@ -72,7 +72,8 @@ static ssize_t socket_writev_buffer(void *opaque, struct iovec *iov, int iovcnt, 
            pfd.fd = s->fd;

            pfd.events = G_IO_OUT | G_IO_ERR;

            pfd.revents = 0;

            g_poll(&pfd, 1 /* 1 fd */, -1 /* no timeout */);

            TFR(err = g_poll(&pfd, 1, -1 /* no timeout */));

            /* Errors other than EINTR intentionally ignored */

        }

     }