diff options
| author | Fabiano Rosas <farosas@suse.de> | 2024-08-27 14:45:51 -0300 |
|---|---|---|
| committer | Fabiano Rosas <farosas@suse.de> | 2024-09-03 16:24:35 -0300 |
| commit | 112f7d1b752543de06ae96210a14abbed7913922 (patch) | |
| tree | 6f7dd5424f22b642624192b30331c70df0e10575 | |
| parent | 171056ec91bf6c895864d11857dd3add1f565492 (diff) | |
| download | qemu-112f7d1b752543de06ae96210a14abbed7913922.zip qemu-112f7d1b752543de06ae96210a14abbed7913922.tar.gz qemu-112f7d1b752543de06ae96210a14abbed7913922.tar.bz2 | |
migration/multifd: Pass in MultiFDPages_t to file_write_ramblock_iov
We want to stop dereferencing 'pages' so it can be replaced by an
opaque pointer in the next patches.
Reviewed-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Fabiano Rosas <farosas@suse.de>
| -rw-r--r-- | migration/file.c | 3 | ||||
| -rw-r--r-- | migration/file.h | 2 | ||||
| -rw-r--r-- | migration/multifd.c | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/migration/file.c b/migration/file.c index 6451a21c..7f11e26 100644 --- a/migration/file.c +++ b/migration/file.c @@ -196,12 +196,13 @@ void file_start_incoming_migration(FileMigrationArgs *file_args, Error **errp) } int file_write_ramblock_iov(QIOChannel *ioc, const struct iovec *iov, - int niov, RAMBlock *block, Error **errp) + int niov, MultiFDPages_t *pages, Error **errp) { ssize_t ret = 0; int i, slice_idx, slice_num; uintptr_t base, next, offset; size_t len; + RAMBlock *block = pages->block; slice_idx = 0; slice_num = 1; diff --git a/migration/file.h b/migration/file.h index 9f71e87..1a1115f 100644 --- a/migration/file.h +++ b/migration/file.h @@ -21,6 +21,6 @@ int file_parse_offset(char *filespec, uint64_t *offsetp, Error **errp); void file_cleanup_outgoing_migration(void); bool file_send_channel_create(gpointer opaque, Error **errp); int file_write_ramblock_iov(QIOChannel *ioc, const struct iovec *iov, - int niov, RAMBlock *block, Error **errp); + int niov, MultiFDPages_t *pages, Error **errp); int multifd_file_recv_data(MultiFDRecvParams *p, Error **errp); #endif diff --git a/migration/multifd.c b/migration/multifd.c index 30e5c68..640e445 100644 --- a/migration/multifd.c +++ b/migration/multifd.c @@ -956,7 +956,7 @@ static void *multifd_send_thread(void *opaque) if (migrate_mapped_ram()) { ret = file_write_ramblock_iov(p->c, p->iov, p->iovs_num, - pages->block, &local_err); + pages, &local_err); } else { ret = qio_channel_writev_full_all(p->c, p->iov, p->iovs_num, NULL, 0, p->write_flags, |