Merge remote-tracking branch 'remotes/dgilbert/tags/pull-migration-20201026a' into...

migration pull: 2020-10-26

Another go at Peter's postcopy fixes

Cleanups from Bihong Yu and Peter Maydell.

Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
# gpg: Signature made Mon 26 Oct 2020 16:17:03 GMT
# gpg:                using RSA key 45F5C71B4A0CB7FB977A9FA90516331EBC5BFDE7
# gpg: Good signature from "Dr. David Alan Gilbert (RH2) <dgilbert@redhat.com>" [full]
# Primary key fingerprint: 45F5 C71B 4A0C B7FB 977A  9FA9 0516 331E BC5B FDE7

* remotes/dgilbert/tags/pull-migration-20201026a:
  migration-test: Only hide error if !QTEST_LOG
  migration/postcopy: Release fd before going into 'postcopy-pause'
  migration: Sync requested pages after postcopy recovery
  migration: Maintain postcopy faulted addresses
  migration: Introduce migrate_send_rp_message_req_pages()
  migration: Pass incoming state into qemu_ufd_copy_ioctl()
  migration: using trace_ to replace DPRINTF
  migration: Delete redundant spaces
  migration: Open brace '{' following function declarations go on the next line
  migration: Do not initialise statics and globals to 0 or NULL
  migration: Add braces {} for if statement
  migration: Open brace '{' following struct go on the same line
  migration: Add spaces around operator
  migration: Don't use '#' flag of printf format
  migration: Do not use C99 // comments
  migration: Drop unused VMSTATE_FLOAT64 support

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

diff --cc migration/migration.c
index deb6005b8d37c3d92e2dc08979d3b11af84fa2ca,627f194b8b8c123bfca849766b305f4185a56db1..9bb4fee5acec1f64874d69a211d1da0d97862132
--- 1/migration/migration.c
--- 2/migration/migration.c
+++ b/migration/migration.c
@@@ -143,8 -143,16 +143,15 @@@ static int migration_maybe_pause(Migrat
                                   int new_state);
  static void migrate_fd_cancel(MigrationState *s);
  
+ static gint page_request_addr_cmp(gconstpointer ap, gconstpointer bp)
+ {
+     uintptr_t a = (uintptr_t) ap, b = (uintptr_t) bp;
+ 
+     return (a > b) - (a < b);
+ }
+ 
  void migration_object_init(void)
  {
 -    MachineState *ms = MACHINE(qdev_get_machine());
      Error *err = NULL;
  
      /* This can only be called once. */