mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

migration: Implement MigrateChannelList to hmp migration flow.

Browse Source 
Integrate MigrateChannelList with all transport backends
(socket, exec and rdma) for both src and dest migration
endpoints for hmp migration.

Suggested-by: Aravind Retnakaran <aravind.retnakaran@nutanix.com>
Signed-off-by: Het Gala <het.gala@nutanix.com>
Signed-off-by: Fabiano Rosas <farosas@suse.de>
Message-ID: <20231023182053.8711-14-farosas@suse.de>
Signed-off-by: Juan Quintela <quintela@redhat.com>
This commit is contained in:
Het Gala 2023-10-23 15:20:52 -03:00 committed by Juan Quintela
parent 5994024fd1
commit 967f2de5c9
3 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
migration/migration-hmp-cmds.c
View File

@ -451,9 +451,18 @@ void hmp_migrate_incoming(Monitor *mon, const QDict *qdict)
{ {
Error *err = NULL; Error *err = NULL;
const char *uri = qdict_get_str(qdict, "uri"); const char *uri = qdict_get_str(qdict, "uri");
MigrationChannelList *caps = NULL;
g_autoptr(MigrationChannel) channel = NULL;
qmp_migrate_incoming(uri, false, NULL, &err); if (!migrate_uri_parse(uri, &channel, &err)) {
goto end;
}
QAPI_LIST_PREPEND(caps, g_steal_pointer(&channel));
qmp_migrate_incoming(NULL, true, caps, &err);
qapi_free_MigrationChannelList(caps);
end:
hmp_handle_error(mon, err); hmp_handle_error(mon, err);
} }
@ -753,6 +762,8 @@ void hmp_migrate(Monitor *mon, const QDict *qdict)
bool resume = qdict_get_try_bool(qdict, "resume", false); bool resume = qdict_get_try_bool(qdict, "resume", false);
const char *uri = qdict_get_str(qdict, "uri"); const char *uri = qdict_get_str(qdict, "uri");
Error *err = NULL; Error *err = NULL;
MigrationChannelList *caps = NULL;
g_autoptr(MigrationChannel) channel = NULL;
if (inc) { if (inc) {
warn_report("option '-i' is deprecated;" warn_report("option '-i' is deprecated;"
@ -764,12 +775,20 @@ void hmp_migrate(Monitor *mon, const QDict *qdict)
" use blockdev-mirror with NBD instead"); " use blockdev-mirror with NBD instead");
} }
qmp_migrate(uri, false, NULL, !!blk, blk, !!inc, inc, if (!migrate_uri_parse(uri, &channel, &err)) {
hmp_handle_error(mon, err);
return;
}
QAPI_LIST_PREPEND(caps, g_steal_pointer(&channel));
qmp_migrate(NULL, true, caps, !!blk, blk, !!inc, inc,
false, false, true, resume, &err); false, false, true, resume, &err);
if (hmp_handle_error(mon, err)) { if (hmp_handle_error(mon, err)) {
return; return;
} }
qapi_free_MigrationChannelList(caps);
if (!detach) { if (!detach) {
HMPMigrationStatus *status; HMPMigrationStatus *status;

5
migration/migration.c
View File

@ -457,9 +457,8 @@ void migrate_add_address(SocketAddress *address)
QAPI_CLONE(SocketAddress, address)); QAPI_CLONE(SocketAddress, address));
} }
static bool migrate_uri_parse(const char *uri, bool migrate_uri_parse(const char *uri, MigrationChannel **channel,
MigrationChannel **channel, Error **errp)
Error **errp)
{ {
g_autoptr(MigrationChannel) val = g_new0(MigrationChannel, 1); g_autoptr(MigrationChannel) val = g_new0(MigrationChannel, 1);
g_autoptr(MigrationAddress) addr = g_new0(MigrationAddress, 1); g_autoptr(MigrationAddress) addr = g_new0(MigrationAddress, 1);

3
migration/migration.h
View File

@ -520,7 +520,8 @@ bool check_dirty_bitmap_mig_alias_map(const BitmapMigrationNodeAliasList *bbm,
Error **errp); Error **errp);
void migrate_add_address(SocketAddress *address); void migrate_add_address(SocketAddress *address);
bool migrate_uri_parse(const char *uri, MigrationChannel **channel,
Error **errp);
int foreach_not_ignored_block(RAMBlockIterFunc func, void *opaque); int foreach_not_ignored_block(RAMBlockIterFunc func, void *opaque);
#define qemu_ram_foreach_block \ #define qemu_ram_foreach_block \