Commit 98c0a88e authored by Peter Maydell's avatar Peter Maydell
Browse files

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



migration/next for 20180525

# gpg: Signature made Fri 25 May 2018 14:30:47 BST
# gpg:                using RSA key F487EF185872D723
# gpg: Good signature from "Juan Quintela <quintela@redhat.com>"
# gpg:                 aka "Juan Quintela <quintela@trasno.org>"
# Primary key fingerprint: 1899 FF8E DEBF 58CC EE03  4B82 F487 EF18 5872 D723

* remotes/juanquintela/tags/migration/20180525:
  migration: use g_free for ram load bitmap
  migration: fix exec/fd migrations

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 5a5c383b bf269906

migration/exec.c

+4 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include "qemu/osdep.h"

#include "channel.h"

#include "exec.h"

#include "migration.h"

#include "io/channel-command.h"

#include "trace.h"
@@ -48,6 +49,9 @@ static gboolean exec_accept_incoming_migration(QIOChannel *ioc, 
{

    migration_channel_process_incoming(ioc);

    object_unref(OBJECT(ioc));

    if (!migrate_use_multifd()) {

        migration_incoming_process();

    }

    return G_SOURCE_REMOVE;

}

migration/fd.c

+4 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include "qemu/osdep.h"

#include "channel.h"

#include "fd.h"

#include "migration.h"

#include "monitor/monitor.h"

#include "io/channel-util.h"

#include "trace.h"
@@ -48,6 +49,9 @@ static gboolean fd_accept_incoming_migration(QIOChannel *ioc, 
{

    migration_channel_process_incoming(ioc);

    object_unref(OBJECT(ioc));

    if (!migrate_use_multifd()) {

        migration_incoming_process();

    }

    return G_SOURCE_REMOVE;

}

migration/ram.c

+2 −2
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ int64_t ramblock_recv_bitmap_send(QEMUFile *file, 
    qemu_put_be64(file, RAMBLOCK_RECV_BITMAP_ENDING);

    qemu_fflush(file);



    free(le_bitmap);

    g_free(le_bitmap);



    if (qemu_file_get_error(file)) {

        return qemu_file_get_error(file);
@@ -3514,7 +3514,7 @@ int ram_dirty_bitmap_reload(MigrationState *s, RAMBlock *block) 


    ret = 0;

out:

    free(le_bitmap);

    g_free(le_bitmap);

    return ret;

}