[Qemu-commits] [qemu/qemu] 895833: migration: Maybe VM is paused when migration is ca...

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 8958338b10abcb346b54a8038a491fda2db1c853
      
https://github.com/qemu/qemu/commit/8958338b10abcb346b54a8038a491fda2db1c853
  Author: Zhimin Feng <address@hidden>
  Date:   2020-02-13 (Thu, 13 Feb 2020)

  Changed paths:
    M migration/migration.c

  Log Message:
  -----------
  migration: Maybe VM is paused when migration is cancelled

If the migration is cancelled when it is in the completion phase,
the migration state is set to MIGRATION_STATUS_CANCELLING.
The VM maybe wait for the 'pause_sem' semaphore in migration_maybe_pause
function, so that VM always is paused.

Reported-by: Euler Robot <address@hidden>
Signed-off-by: Zhimin Feng <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>


  Commit: d05de9e39a5fb5582a875a95c4b9c2c8584ea694
      
https://github.com/qemu/qemu/commit/d05de9e39a5fb5582a875a95c4b9c2c8584ea694
  Author: Keqian Zhu <address@hidden>
  Date:   2020-02-13 (Thu, 13 Feb 2020)

  Changed paths:
    M migration/migration.c
    M migration/savevm.c
    M migration/savevm.h

  Log Message:
  -----------
  migration: Optimization about wait-unplug migration state

qemu_savevm_nr_failover_devices() is originally designed to
get the number of failover devices, but it actually returns
the number of "unplug-pending" failover devices now. Moreover,
what drives migration state to wait-unplug should be the number
of "unplug-pending" failover devices, not all failover devices.

We can also notice that qemu_savevm_state_guest_unplug_pending()
and qemu_savevm_nr_failover_devices() is equivalent almost (from
the code view). So the latter is incorrect semantically and
useless, just delete it.

In the qemu_savevm_state_guest_unplug_pending(), once hit a
unplug-pending failover device, then it can return true right
now to save cpu time.

Signed-off-by: Keqian Zhu <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Tested-by: Jens Freimann <address@hidden>
Reviewed-by: Jens Freimann <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>


  Commit: 2a1bc8bde7cc42ea8bf5d52c7c9a7774fde0edcd
      
https://github.com/qemu/qemu/commit/2a1bc8bde7cc42ea8bf5d52c7c9a7774fde0edcd
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2020-02-13 (Thu, 13 Feb 2020)

  Changed paths:
    M migration/rdma.c

  Log Message:
  -----------
  migration/rdma: rdma_accept_incoming_migration fix error handling

rdma_accept_incoming_migration is called from an fd handler and
can't return an Error * anywhere.
Currently it's leaking Error's in errp/local_err - there's
no point putting them in there unless we can report them.

Turn most into fprintf's, and the last into an error_reportf_err
where it's coming up from another function.

Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>


  Commit: 6e1f837a142731e0a271aae2eb83c17ca32f4db3
      
https://github.com/qemu/qemu/commit/6e1f837a142731e0a271aae2eb83c17ca32f4db3
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2020-02-13 (Thu, 13 Feb 2020)

  Changed paths:
    M tests/qtest/migration-test.c

  Log Message:
  -----------
  tests/migration: Add some slack to auto converge

There's an assert in autoconverge that checks that we quit the
iteration when we go below the expected threshold.  Philippe
saw a case where this assert fired with the measured value
slightly over the threshold. (about 3k out of a few million).

I can think of two reasons:
  a) Rounding errors
  b) That after we make the decision to quit iteration we do one
    more sync and that sees a few more dirty pages.

So add 1% slack to the assertion, that should cover a and
most cases of b, probably all we'll see for the test.

Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Reviewed-by: Peter Xu <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>


  Commit: e022d47388e339d9287a17d8072d4c2e8a9a427e
      
https://github.com/qemu/qemu/commit/e022d47388e339d9287a17d8072d4c2e8a9a427e
  Author: Pan Nengyuan <address@hidden>
  Date:   2020-02-13 (Thu, 13 Feb 2020)

  Changed paths:
    M tests/qtest/migration-test.c

  Log Message:
  -----------
  migration-test: fix some memleaks in migration-test

spotted by asan, 'check-qtest-aarch64' runs fail if sanitizers is enabled.

Reported-by: Euler Robot <address@hidden>
Signed-off-by: Pan Nengyuan <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Reviewed-by: Laurent Vivier <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>


  Commit: 1a920d2b633e13df8961328b3b3e128989a34570
      
https://github.com/qemu/qemu/commit/1a920d2b633e13df8961328b3b3e128989a34570
  Author: Juan Quintela <address@hidden>
  Date:   2020-02-13 (Thu, 13 Feb 2020)

  Changed paths:
    M scripts/git-submodule.sh

  Log Message:
  -----------
  git: Make submodule check only needed modules

If one is compiling more than one tree from the same source, it is
possible that they need different submodules.  Change the check to see
that all modules that we are interested in are updated, discarding the
ones that we don't care about.

Signed-off-by: Juan Quintela <address@hidden>

---

v1->v2:
patchw insists in not using modules


  Commit: b29c3e23f64938784c42ef9fca896829e3c19120
      
https://github.com/qemu/qemu/commit/b29c3e23f64938784c42ef9fca896829e3c19120
  Author: Peter Maydell <address@hidden>
  Date:   2020-02-14 (Fri, 14 Feb 2020)

  Changed paths:
    M migration/migration.c
    M migration/rdma.c
    M migration/savevm.c
    M migration/savevm.h
    M scripts/git-submodule.sh
    M tests/qtest/migration-test.c

  Log Message:
  -----------
  Merge remote-tracking branch 
'remotes/juanquintela/tags/pull-migration-pull-request' into staging

Migration pull request

# gpg: Signature made Thu 13 Feb 2020 13:04:43 GMT
# gpg:                using RSA key 1899FF8EDEBF58CCEE034B82F487EF185872D723
# gpg: Good signature from "Juan Quintela <address@hidden>" [full]
# gpg:                 aka "Juan Quintela <address@hidden>" [full]
# Primary key fingerprint: 1899 FF8E DEBF 58CC EE03  4B82 F487 EF18 5872 D723

* remotes/juanquintela/tags/pull-migration-pull-request:
  git: Make submodule check only needed modules
  migration-test: fix some memleaks in migration-test
  tests/migration: Add some slack to auto converge
  migration/rdma: rdma_accept_incoming_migration fix error handling
  migration: Optimization about wait-unplug migration state
  migration: Maybe VM is paused when migration is cancelled

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/71cd1bccf3bf...b29c3e23f649