diff options
| author | Fabiano Rosas <farosas@suse.de> | 2024-02-29 12:30:12 -0300 |
|---|---|---|
| committer | Peter Xu <peterx@redhat.com> | 2024-03-01 15:42:04 +0800 |
| commit | 2dd7ee7a51bc0a90abe410d6223b297cf2925e4f (patch) | |
| tree | de69df5522741d06c28d23d0e37b73d2ddbe73c7 /migration/migration.c | |
| parent | b7b03eb614d01079f9b1f7a1d342140b5055a559 (diff) | |
| download | qemu-2dd7ee7a51bc0a90abe410d6223b297cf2925e4f.zip qemu-2dd7ee7a51bc0a90abe410d6223b297cf2925e4f.tar.gz qemu-2dd7ee7a51bc0a90abe410d6223b297cf2925e4f.tar.bz2 | |
migration/multifd: Add incoming QIOChannelFile support
On the receiving side we don't need to differentiate between main
channel and threads, so whichever channel is defined first gets to be
the main one. And since there are no packets, use the atomic channel
count to index into the params array.
Reviewed-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Fabiano Rosas <farosas@suse.de>
Link: https://lore.kernel.org/r/20240229153017.2221-19-farosas@suse.de
Signed-off-by: Peter Xu <peterx@redhat.com>
Diffstat (limited to 'migration/migration.c')
| -rw-r--r-- | migration/migration.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/migration/migration.c b/migration/migration.c index 2669600..faeb75a 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -910,7 +910,8 @@ void migration_ioc_process_incoming(QIOChannel *ioc, Error **errp) uint32_t channel_magic = 0; int ret = 0; - if (migrate_multifd() && !migrate_postcopy_ram() && + if (migrate_multifd() && !migrate_mapped_ram() && + !migrate_postcopy_ram() && qio_channel_has_feature(ioc, QIO_CHANNEL_FEATURE_READ_MSG_PEEK)) { /* * With multiple channels, it is possible that we receive channels |