From: Peter Maydell <peter.maydell@linaro.org>
Date: Fri, 5 Jan 2024 13:35:25 +0000 (+0000)
Subject: Merge tag 'migration-20240104-pull-request' of https://gitlab.com/peterx/qemu into... 
X-Git-Tag: v9.0.0-rc0~124
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c8193acc078e297fd46b6229e02b819b65c6702e;p=thirdparty%2Fqemu.git

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

migration 1st pull for 9.0

- We lost Juan and Leo in the maintainers file
- Steven's suspend state fix
- Steven's fix for coverity on migrate_mode
- Avihai's migration cleanup series

# -----BEGIN PGP SIGNATURE-----
#
# iIgEABYKADAWIQS5GE3CDMRX2s990ak7X8zN86vXBgUCZZY0TxIccGV0ZXJ4QHJl
# ZGhhdC5jb20ACgkQO1/MzfOr1wbSxgEAoM5g3wkc22lpAlRpU+hJUqT9NVOVQSK+
# Fk7XJYTdSgABAKzykA6hAmU5Kj+yVI6jI874SVZbs2FWpFs4osvsKk4D
# =sfuM
# -----END PGP SIGNATURE-----
# gpg: Signature made Thu 04 Jan 2024 04:30:07 GMT
# gpg:                using EDDSA key B9184DC20CC457DACF7DD1A93B5FCCCDF3ABD706
# gpg:                issuer "peterx@redhat.com"
# gpg: Good signature from "Peter Xu <xzpeter@gmail.com>" [unknown]
# gpg:                 aka "Peter Xu <peterx@redhat.com>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: B918 4DC2 0CC4 57DA CF7D  D1A9 3B5F CCCD F3AB D706

* tag 'migration-20240104-pull-request' of https://gitlab.com/peterx/qemu: (26 commits)
  migration: fix coverity migrate_mode finding
  migration/multifd: Remove unnecessary usage of local Error
  migration: Remove unnecessary usage of local Error
  migration: Fix migration_channel_read_peek() error path
  migration/multifd: Remove error_setg() in migration_ioc_process_incoming()
  migration/multifd: Fix leaking of Error in TLS error flow
  migration/multifd: Simplify multifd_channel_connect() if else statement
  migration/multifd: Fix error message in multifd_recv_initial_packet()
  migration: Remove errp parameter in migration_fd_process_incoming()
  migration: Refactor migration_incoming_setup()
  migration: Remove nulling of hostname in migrate_init()
  migration: Remove migrate_max_downtime() declaration
  tests/qtest: postcopy migration with suspend
  tests/qtest: precopy migration with suspend
  tests/qtest: option to suspend during migration
  tests/qtest: migration events
  migration: preserve suspended for bg_migration
  migration: preserve suspended for snapshot
  migration: preserve suspended runstate
  migration: propagate suspended runstate
  ...

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

c8193acc078e297fd46b6229e02b819b65c6702e
diff --cc migration/global_state.c
index 8ee15dbb061,64a573c6833..3a9796cae28
--- a/migration/global_state.c
+++ b/migration/global_state.c
@@@ -131,9 -135,12 +135,12 @@@ static const VMStateDescription vmstate
      .post_load = global_state_post_load,
      .pre_save = global_state_pre_save,
      .needed = global_state_needed,
 -    .fields = (VMStateField[]) {
 +    .fields = (const VMStateField[]) {
          VMSTATE_UINT32(size, GlobalState),
          VMSTATE_BUFFER(runstate, GlobalState),
+         VMSTATE_UINT8(has_vm_was_suspended, GlobalState),
+         VMSTATE_UINT8(vm_was_suspended, GlobalState),
+         VMSTATE_BUFFER(unused, GlobalState),
          VMSTATE_END_OF_LIST()
      },
  };