From: Author Het Gala <het.g...@nutanix.com>
hmp_migrate() accepts uri (backward compatibility) and a
well-defined struct for migration parameters, and with help of
migrate_channel_from_qdict() maps QDict's 'key':'value' pair
required for migration stream into MigrateChannel struct.
Suggested-by: Daniel P. Berrange <berra...@redhat.com>
Suggested-by: Manish Mishra <manish.mis...@nutanix.com>
Suggested-by: Aravind Retnakaran <aravind.retnaka...@nutanix.com>
Signed-off-by: Het Gala <het.g...@nutanix.com>
---
migration/migration.c | 6 +--
monitor/hmp-cmds.c | 91 ++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 93 insertions(+), 4 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index 52b5d39244..1b6e62612a 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -2391,9 +2391,9 @@ static bool migrate_prepare(MigrationState *s, bool blk,
bool blk_inc,
return true;
}
-void qmp_migrate(const char *uri, bool has_blk, bool blk,
- bool has_inc, bool inc, bool has_detach, bool detach,
- bool has_resume, bool resume, Error **errp)
+void qmp_migrate(const char *uri, MigrateChannel *channel, bool has_blk,
+ bool blk, bool has_inc, bool inc, bool has_detach,
+ bool detach, bool has_resume, bool resume, Error **errp)
{
Error *local_err = NULL;
MigrationState *s = migrate_get_current();
diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
index ed78a87ddd..e44d96f5dc 100644
--- a/monitor/hmp-cmds.c
+++ b/monitor/hmp-cmds.c
@@ -999,6 +999,91 @@ void hmp_announce_self(Monitor *mon, const QDict *qdict)
qapi_free_AnnounceParameters(params);
}
+static void
+migrate_channel_from_qdict(MigrateChannel **channel,
+ const QDict *qdict, Error **errp)
+{
+ Error *err = NULL;
+ const char *channeltype = qdict_get_try_str(qdict, "channeltype");
+ const char *transport_str = qdict_get_try_str(qdict, "transport");
+ const char *socketaddr_type = qdict_get_try_str(qdict, "type");
+ const char *inet_host = qdict_get_try_str(qdict, "host");
+ const char *inet_port = qdict_get_try_str(qdict, "port");
+ const char *unix_path = qdict_get_try_str(qdict, "path");
+ const char *vsock_cid = qdict_get_try_str(qdict, "cid");
+ const char *vsock_port = qdict_get_try_str(qdict, "port");
+ const char *fd_str = qdict_get_try_str(qdict, "str");
+ const char *exec_str = qdict_get_try_str(qdict, "exec-str");
+ const char *rdma_str = qdict_get_try_str(qdict, "rdma-str");
+ MigrateChannel *val = g_new0(MigrateChannel, 1);
+ MigrateChannelType channel_type;
+ MigrateTransport transport;
+ MigrateAddress *addr = g_new0(MigrateAddress, 1);
+ SocketAddress *saddr = g_new(SocketAddress, 1);
+ SocketAddressType type;
+
+ channel_type = qapi_enum_parse(&MigrateChannelType_lookup,
+ channeltype, -1, &err);
+ if (channel_type < 0) {
+ goto end;
+ }
+
+ transport = qapi_enum_parse(&MigrateTransport_lookup,
+ transport_str, -1, &err);
+ if (transport < 0) {
+ goto end;
+ }
+
+ type = qapi_enum_parse(&SocketAddressType_lookup,
+ socketaddr_type, -1, &err);
+ if (type < 0) {
+ goto end;
+ }
+
+ addr->transport = transport;
+ switch (transport) {
+ case MIGRATE_TRANSPORT_SOCKET:
+ switch (type) {
+ case SOCKET_ADDRESS_TYPE_INET:
+ saddr->type = SOCKET_ADDRESS_TYPE_INET;
+ saddr->u.inet.host = (char *)inet_host;
+ saddr->u.inet.port = (char *)inet_port;
+ break;
+ case SOCKET_ADDRESS_TYPE_UNIX:
+ saddr->type = SOCKET_ADDRESS_TYPE_UNIX;
+ saddr->u.q_unix.path = (char *)unix_path;
+ break;
+ case SOCKET_ADDRESS_TYPE_VSOCK:
+ saddr->type = SOCKET_ADDRESS_TYPE_VSOCK;
+ saddr->u.vsock.cid = (char *)vsock_cid;
+ saddr->u.vsock.port = (char *)vsock_port;
+ break;
+ case SOCKET_ADDRESS_TYPE_FD:
+ saddr->type = SOCKET_ADDRESS_TYPE_FD;
+ saddr->u.fd.str = (char *)fd_str;
+ break;
+ default:
+ break;
+ }
+ addr->u.socket.socket_type = saddr;
+ break;
+ case MIGRATE_TRANSPORT_EXEC:
+ addr->u.exec.exec_str = (char *)exec_str;
+ break;
+ case MIGRATE_TRANSPORT_RDMA:
+ addr->u.rdma.rdma_str = (char *)rdma_str;
+ break;
+ default:
+ break;
+ }
+
+ val->channeltype = channel_type;
+ val->addr = addr;
+ *channel = val;
+end:
+ error_propagate(errp, err);
+}
+
void hmp_migrate_cancel(Monitor *mon, const QDict *qdict)
{
qmp_migrate_cancel(NULL);
@@ -1441,8 +1526,12 @@ void hmp_migrate(Monitor *mon, const QDict *qdict)
const char *uri = qdict_get_str(qdict, "uri");
Error *err = NULL;
- qmp_migrate(uri, !!blk, blk, !!inc, inc,
+ MigrateChannel *channel = g_new0(MigrateChannel, 1);
+ migrate_channel_from_qdict(&channel, qdict, &err);
+
+ qmp_migrate(uri, channel, !!blk, blk, !!inc, inc,
false, false, true, resume, &err);
+ qapi_free_MigrateChannel(channel);
if (hmp_handle_error(mon, err)) {
return;
}
--
2.22.3
