mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

migration/next for 20180525

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQIcBAABCAAGBQJbCBAHAAoJEPSH7xhYctcj4pkQAKxgSYZrRP+4pHcZQ57Nm6bG
 jvxowyQBqskU6F5QyF2MYPOfv/TGM8tH0sZtZ9XPz99UWQ8otwOmK0jdTh029V6P
 06fMUP5vHbHqh2xEcTSxnXAVuUEg5ZUH5UyAdDMtrhZpgIjmsEOnS/2ip5bJE8oO
 LyNKNlDDcmFgEv41QjdmAnBZ0eMDUOoC4wEPvKc2GxX0x1UYhprB1gC0/pCXdRCd
 dmY7P5iVSQSUveih6twG404Tz16U6Z8Duz/fTeLMoPJ5Eqbv0i0bZI28S1TJ8oRt
 OT00zOjR5Bi/cp/WBneGjobiBYqvjkRh4fJ6SdLaTZrxyqNfVnWryfHvRI82DxAs
 xX6hqQO1lT92DBOQ1NSJTkTA6v6SlCuZNquPSq7zfTsMilNrTlvAfNgYYBwZuLCT
 ac3Nt16dNJ/hsnLQqbBr5TL3mbvJE4qmoj8maHkWwAQ7GyGmhRke3tCJBTds9knp
 skElS8i1oACF7JOBO4YKUOFaxH0owY3M4ajRvZE5dKVnexWj5HKIhlQVFQS6lS+5
 6eJlUvO+owuVXxcs22J6T++0L05qQLi6NCxyE96UFvwxq4p/ol2gDSMNPgd3Z5E+
 O2y0erpYW65ebsRI8OSr5lF1JL5Vc1KodHq93piARryfteKRysjKo2+/1475DWH+
 GZSmx/eyXO0TS/Pqwub1
 =ulv9
 -----END PGP SIGNATURE-----

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: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2018-05-25 17:52:34 +01:00
commit 98c0a88ea3
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
migration/exec.c
View File

@ -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;
}

4
migration/fd.c
View File

@ -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;
}

4
migration/ram.c
View File

@ -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;
}