OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

migration: Move migrate_use_return() to options.c

Browse Source 
Once that we are there, we rename the function to migrate_return_path()
to be consistent with all other capabilities.

Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
This commit is contained in:
Juan Quintela 2023-03-01 22:25:47 +01:00
parent 9d4b1e5f22
commit 38ad1110e3
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
migration/migration.c
View File

@ -2622,15 +2622,6 @@ static int64_t migrate_max_postcopy_bandwidth(void)
return s->parameters.max_postcopy_bandwidth; return s->parameters.max_postcopy_bandwidth;
} }
bool migrate_use_return_path(void)
{
MigrationState *s;
s = migrate_get_current();
return s->capabilities[MIGRATION_CAPABILITY_RETURN_PATH];
}
bool migrate_use_block_incremental(void) bool migrate_use_block_incremental(void)
{ {
MigrationState *s; MigrationState *s;
@ -4171,7 +4162,7 @@ void migrate_fd_connect(MigrationState *s, Error *error_in)
* precopy, only if user specified "return-path" capability would * precopy, only if user specified "return-path" capability would
* QEMU uses the return path. * QEMU uses the return path.
*/ */
if (migrate_postcopy_ram() || migrate_use_return_path()) { if (migrate_postcopy_ram() || migrate_return_path()) {
if (open_return_path_on_source(s, !resume)) { if (open_return_path_on_source(s, !resume)) {
error_report("Unable to open return-path for postcopy"); error_report("Unable to open return-path for postcopy");
migrate_set_state(&s->state, s->state, MIGRATION_STATUS_FAILED); migrate_set_state(&s->state, s->state, MIGRATION_STATUS_FAILED);

1
migration/migration.h
View File

@ -459,7 +459,6 @@ uint64_t migrate_xbzrle_cache_size(void);
bool migrate_use_block_incremental(void); bool migrate_use_block_incremental(void);
int migrate_max_cpu_throttle(void); int migrate_max_cpu_throttle(void);
bool migrate_use_return_path(void);
uint64_t ram_get_total_transferred_pages(void); uint64_t ram_get_total_transferred_pages(void);

9
migration/options.c
View File

@ -147,6 +147,15 @@ bool migrate_release_ram(void)
return s->capabilities[MIGRATION_CAPABILITY_RELEASE_RAM]; return s->capabilities[MIGRATION_CAPABILITY_RELEASE_RAM];
} }
bool migrate_return_path(void)
{
MigrationState *s;
s = migrate_get_current();
return s->capabilities[MIGRATION_CAPABILITY_RETURN_PATH];
}
bool migrate_validate_uuid(void) bool migrate_validate_uuid(void)
{ {
MigrationState *s; MigrationState *s;

1
migration/options.h
View File

@ -31,6 +31,7 @@ bool migrate_postcopy_blocktime(void);
bool migrate_postcopy_preempt(void); bool migrate_postcopy_preempt(void);
bool migrate_postcopy_ram(void); bool migrate_postcopy_ram(void);
bool migrate_release_ram(void); bool migrate_release_ram(void);
bool migrate_return_path(void);
bool migrate_validate_uuid(void); bool migrate_validate_uuid(void);
bool migrate_xbzrle(void); bool migrate_xbzrle(void);
bool migrate_zero_blocks(void); bool migrate_zero_blocks(void);

6
migration/rdma.c
View File

@ -3373,7 +3373,7 @@ static int qemu_rdma_accept(RDMAContext *rdma)
* initialize the RDMAContext for return path for postcopy after first * initialize the RDMAContext for return path for postcopy after first
* connection request reached. * connection request reached.
*/ */
if ((migrate_postcopy() || migrate_use_return_path()) if ((migrate_postcopy() || migrate_return_path())
&& !rdma->is_return_path) { && !rdma->is_return_path) {
rdma_return_path = qemu_rdma_data_init(rdma->host_port, NULL); rdma_return_path = qemu_rdma_data_init(rdma->host_port, NULL);
if (rdma_return_path == NULL) { if (rdma_return_path == NULL) {
@ -3456,7 +3456,7 @@ static int qemu_rdma_accept(RDMAContext *rdma)
} }
/* Accept the second connection request for return path */ /* Accept the second connection request for return path */
if ((migrate_postcopy() || migrate_use_return_path()) if ((migrate_postcopy() || migrate_return_path())
&& !rdma->is_return_path) { && !rdma->is_return_path) {
qemu_set_fd_handler(rdma->channel->fd, rdma_accept_incoming_migration, qemu_set_fd_handler(rdma->channel->fd, rdma_accept_incoming_migration,
NULL, NULL,
@ -4193,7 +4193,7 @@ void rdma_start_outgoing_migration(void *opaque,
} }
/* RDMA postcopy need a separate queue pair for return path */ /* RDMA postcopy need a separate queue pair for return path */
if (migrate_postcopy() || migrate_use_return_path()) { if (migrate_postcopy() || migrate_return_path()) {
rdma_return_path = qemu_rdma_data_init(host_port, errp); rdma_return_path = qemu_rdma_data_init(host_port, errp);
if (rdma_return_path == NULL) { if (rdma_return_path == NULL) {