[Qemu-commits] [qemu/qemu] 30158d: migration: Set migration error in migration_comple...

[Peter Maydell]

  Branch: refs/heads/staging
  Home:   https://github.com/qemu/qemu
  Commit: 30158d885008246f48ee8ef9cdeca220c1bd8586
      
https://github.com/qemu/qemu/commit/30158d885008246f48ee8ef9cdeca220c1bd8586
  Author: Avihai Horon <avihaih@nvidia.com>
  Date:   2024-03-31 (Sun, 31 Mar 2024)

  Changed paths:
    M migration/migration.c

  Log Message:
  -----------
  migration: Set migration error in migration_completion()

After commit 9425ef3f990a ("migration: Use migrate_has_error() in
close_return_path_on_source()"), close_return_path_on_source() assumes
that migration error is set if an error occurs during migration.

This may not be true if migration errors in migration_completion(). For
example, if qemu_savevm_state_complete_precopy() errors, migration error
will not be set.

This in turn, will cause a migration hang bug, similar to the bug that
was fixed by commit 22b04245f0d5 ("migration: Join the return path
thread before releasing to_dst_file"), as shutdown() will not be issued
for the return-path channel.

Fix it by ensuring migration error is set in case of error in
migration_completion().

Signed-off-by: Avihai Horon <avihaih@nvidia.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Fixes: 9425ef3f990a ("migration: Use migrate_has_error() in 
close_return_path_on_source()")
Acked-by: Cédric Le Goater <clg@redhat.com>
Link: https://lore.kernel.org/r/20240328140252.16756-2-avihaih@nvidia.com
Signed-off-by: Peter Xu <peterx@redhat.com>


  Commit: d0ad271a7613459bd0a3397c8071a4ad06f3f7eb
      
https://github.com/qemu/qemu/commit/d0ad271a7613459bd0a3397c8071a4ad06f3f7eb
  Author: Avihai Horon <avihaih@nvidia.com>
  Date:   2024-03-31 (Sun, 31 Mar 2024)

  Changed paths:
    M migration/migration.c

  Log Message:
  -----------
  migration/postcopy: Ensure postcopy_start() sets errp if it fails

There are several places where postcopy_start() fails without setting
errp. This can cause a null pointer de-reference, as in case of error,
the caller of postcopy_start() copies/prints the error set in errp.

Fix it by setting errp in all of postcopy_start() error paths.

Cc: qemu-stable <qemu-stable@nongnu.org>
Fixes: 908927db28ea ("migration: Update error description whenever migration 
fails")
Signed-off-by: Avihai Horon <avihaih@nvidia.com>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Link: https://lore.kernel.org/r/20240328140252.16756-3-avihaih@nvidia.com
Signed-off-by: Peter Xu <peterx@redhat.com>


  Commit: 1d2f2b35bc86b7a13dc3009a3c5031220aa0b7de
      
https://github.com/qemu/qemu/commit/1d2f2b35bc86b7a13dc3009a3c5031220aa0b7de
  Author: Michael Tokarev <mjt@tls.msk.ru>
  Date:   2024-04-01 (Mon, 01 Apr 2024)

  Changed paths:
    M .gitlab-ci.d/cirrus.yml

  Log Message:
  -----------
  gitlab-ci/cirrus: switch from 'master' to 'latest'

Commit ab72522797 "gitlab: switch from 'stable' to
'latest' docker container tags" switched most tags
to 'latest' but missed cirrus image.  Fix this now.

Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2256
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Message-id: 20240401051633.2780456-1-mjt@tls.msk.ru
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


  Commit: 6af9d12c88b9720f209912f6e4b01fefe5906d59
      
https://github.com/qemu/qemu/commit/6af9d12c88b9720f209912f6e4b01fefe5906d59
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2024-04-01 (Mon, 01 Apr 2024)

  Changed paths:
    M migration/migration.c

  Log Message:
  -----------
  Merge tag 'migration-20240331-pull-request' of https://gitlab.com/peterx/qemu 
into staging

Migration pull for 9.0-rc2

- Avihai's two fixes on error paths

# -----BEGIN PGP SIGNATURE-----
#
# iIgEABYKADAWIQS5GE3CDMRX2s990ak7X8zN86vXBgUCZgmsOxIccGV0ZXJ4QHJl
# ZGhhdC5jb20ACgkQO1/MzfOr1waYKQD9G/B4c5u94Puhkr4o+K4M3FZ3J1pSpYRd
# nMAlrCWYLHQBAKV5q8DvgXbRNzT/Q+1UX7psxIsjyaqljxyJoZ+dIgAD
# =hucV
# -----END PGP SIGNATURE-----
# gpg: Signature made Sun 31 Mar 2024 19:32:27 BST
# gpg:                using EDDSA key B9184DC20CC457DACF7DD1A93B5FCCCDF3ABD706
# gpg:                issuer "peterx@redhat.com"
# gpg: Good signature from "Peter Xu <xzpeter@gmail.com>" [marginal]
# gpg:                 aka "Peter Xu <peterx@redhat.com>" [marginal]
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: B918 4DC2 0CC4 57DA CF7D  D1A9 3B5F CCCD F3AB D706

* tag 'migration-20240331-pull-request' of https://gitlab.com/peterx/qemu:
  migration/postcopy: Ensure postcopy_start() sets errp if it fails
  migration: Set migration error in migration_completion()

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


Compare: https://github.com/qemu/qemu/compare/7901c12bd77e...6af9d12c88b9

To unsubscribe from these emails, change your notification settings at 
https://github.com/qemu/qemu/settings/notifications