summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2024-12-03 10:22:13 +0000
committerPeter Maydell <peter.maydell@linaro.org>2024-12-03 10:22:13 +0000
commitb2e64cb929c178629f53c7eb50649ea84c745d71 (patch)
tree20b90df0b9e9badebb09324f3111068a7c7ffa3d
parenteb22a064455aeebc105cc89bf77f48aa18b52938 (diff)
parent3b83e663611c628bb04ae84a4f7ee49bdb68138b (diff)
downloadfocaccia-qemu-b2e64cb929c178629f53c7eb50649ea84c745d71.tar.gz
focaccia-qemu-b2e64cb929c178629f53c7eb50649ea84c745d71.zip
Merge tag 'migration-20241202-pull-request' of https://gitlab.com/peterx/qemu into staging
Migration pull for 9.2-rc3

- Prasad's one fix on thread name typo

# -----BEGIN PGP SIGNATURE-----
#
# iIgEABYKADAWIQS5GE3CDMRX2s990ak7X8zN86vXBgUCZ04mxBIccGV0ZXJ4QHJl
# ZGhhdC5jb20ACgkQO1/MzfOr1wbyegEAxWBfoGpPoysYOe+ijwMZKgsXylWzHrfJ
# HGlVck7f1RQA/jAwS8aR3t6QZwhL42lXfAlGPX2ebz4IL+f52qs6/nQP
# =L+tL
# -----END PGP SIGNATURE-----
# gpg: Signature made Mon 02 Dec 2024 21:29:40 GMT
# 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-20241202-pull-request' of https://gitlab.com/peterx/qemu:
  migration: correct multifd receive thread name

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-rw-r--r--migration/migration.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/migration/migration.h b/migration/migration.h
index 0956e9274b..3857905c0e 100644
--- a/migration/migration.h
+++ b/migration/migration.h
@@ -37,7 +37,7 @@
 #define  MIGRATION_THREAD_SRC_TLS           "mig/src/tls"
 
 #define  MIGRATION_THREAD_DST_COLO          "mig/dst/colo"
-#define  MIGRATION_THREAD_DST_MULTIFD       "mig/src/recv_%d"
+#define  MIGRATION_THREAD_DST_MULTIFD       "mig/dst/recv_%d"
 #define  MIGRATION_THREAD_DST_FAULT         "mig/dst/fault"
 #define  MIGRATION_THREAD_DST_LISTEN        "mig/dst/listen"
 #define  MIGRATION_THREAD_DST_PREEMPT       "mig/dst/preempt"