[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 4/6] migration: Create uri parameter
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 4/6] migration: Create uri parameter |
Date: |
Mon, 30 Oct 2017 12:21:10 +0100 |
It will be used to store the uri migration parameter. Right now it is
just the parameter code.
Signed-off-by: Juan Quintela <address@hidden>
---
hmp.c | 7 +++++++
migration/migration.c | 13 +++++++++++++
qapi/migration.json | 18 +++++++++++++++---
3 files changed, 35 insertions(+), 3 deletions(-)
diff --git a/hmp.c b/hmp.c
index a01be50daa..9c544560bb 100644
--- a/hmp.c
+++ b/hmp.c
@@ -345,6 +345,9 @@ void hmp_info_migrate_parameters(Monitor *mon, const QDict
*qdict)
monitor_printf(mon, "%s: %" PRId64 "\n",
MigrationParameter_str(MIGRATION_PARAMETER_XBZRLE_CACHE_SIZE),
params->xbzrle_cache_size);
+ monitor_printf(mon, "%s: %s\n",
+ MigrationParameter_str(MIGRATION_PARAMETER_URI),
+ params->uri);
}
qapi_free_MigrationParameters(params);
@@ -1667,6 +1670,10 @@ void hmp_migrate_set_parameter(Monitor *mon, const QDict
*qdict)
}
p->xbzrle_cache_size = cache_size;
break;
+ case MIGRATION_PARAMETER_URI:
+ p->has_uri = true;
+ visit_type_str(v, param, &p->uri, &err);
+ break;
default:
assert(0);
}
diff --git a/migration/migration.c b/migration/migration.c
index 706d2407ec..3e48d37880 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -517,6 +517,8 @@ MigrationParameters *qmp_query_migrate_parameters(Error
**errp)
params->x_multifd_page_count = s->parameters.x_multifd_page_count;
params->has_xbzrle_cache_size = true;
params->xbzrle_cache_size = s->parameters.xbzrle_cache_size;
+ params->has_uri = true;
+ params->uri = g_strdup(s->parameters.uri);
return params;
}
@@ -893,6 +895,9 @@ static void migrate_params_test_apply(MigrateSetParameters
*params,
if (params->has_xbzrle_cache_size) {
dest->xbzrle_cache_size = params->xbzrle_cache_size;
}
+ if (params->has_uri) {
+ dest->uri = g_strdup(params->uri);
+ }
}
static void migrate_params_apply(MigrateSetParameters *params, Error **errp)
@@ -965,6 +970,10 @@ static void migrate_params_apply(MigrateSetParameters
*params, Error **errp)
s->parameters.xbzrle_cache_size = params->xbzrle_cache_size;
xbzrle_cache_resize(params->xbzrle_cache_size, errp);
}
+ if (params->has_uri) {
+ g_free(s->parameters.uri);
+ s->parameters.uri = g_strdup(params->uri);
+ }
}
void qmp_migrate_set_parameters(MigrateSetParameters *params, Error **errp)
@@ -2431,6 +2440,8 @@ static Property migration_properties[] = {
DEFINE_PROP_SIZE("xbzrle-cache-size", MigrationState,
parameters.xbzrle_cache_size,
DEFAULT_MIGRATE_XBZRLE_CACHE_SIZE),
+ DEFINE_PROP_STRING("x-uri", MigrationState,
+ parameters.uri),
/* Migration capabilities */
DEFINE_PROP_MIG_CAP("x-xbzrle", MIGRATION_CAPABILITY_XBZRLE),
@@ -2465,6 +2476,7 @@ static void migration_instance_finalize(Object *obj)
qemu_mutex_destroy(&ms->error_mutex);
g_free(params->tls_hostname);
g_free(params->tls_creds);
+ g_free(params->uri);
qemu_sem_destroy(&ms->pause_sem);
}
@@ -2480,6 +2492,7 @@ static void migration_instance_init(Object *obj)
params->tls_hostname = g_strdup("");
params->tls_creds = g_strdup("");
+ params->uri = g_strdup("");
/* Set has_* up only for parameter checks */
params->has_compress_level = true;
diff --git a/qapi/migration.json b/qapi/migration.json
index bbc4671ded..ebde890604 100644
--- a/qapi/migration.json
+++ b/qapi/migration.json
@@ -488,6 +488,9 @@
# and a power of 2
# (Since 2.11)
#
+# @uri: defines the method we are susing to migrate
+# (Since 2.11)
+#
# Since: 2.4
##
{ 'enum': 'MigrationParameter',
@@ -496,7 +499,7 @@
'tls-creds', 'tls-hostname', 'max-bandwidth',
'downtime-limit', 'x-checkpoint-delay', 'block-incremental',
'x-multifd-channels', 'x-multifd-page-count',
- 'xbzrle-cache-size' ] }
+ 'xbzrle-cache-size', 'uri' ] }
##
# @MigrateSetParameters:
@@ -564,6 +567,10 @@
# needs to be a multiple of the target page size
# and a power of 2
# (Since 2.11)
+#
+# @uri: defines the method we are susing to migrate
+# (Since 2.11)
+#
# Since: 2.4
##
# TODO either fuse back into MigrationParameters, or make
@@ -582,7 +589,8 @@
'*block-incremental': 'bool',
'*x-multifd-channels': 'int',
'*x-multifd-page-count': 'int',
- '*xbzrle-cache-size': 'size' } }
+ '*xbzrle-cache-size': 'size' ,
+ '*uri': 'str'} }
##
# @migrate-set-parameters:
@@ -665,6 +673,9 @@
# needs to be a multiple of the target page size
# and a power of 2
# (Since 2.11)
+#
+# @uri: defines the method we are susing to migrate
+# (Since 2.11)
# Since: 2.4
##
{ 'struct': 'MigrationParameters',
@@ -681,7 +692,8 @@
'*block-incremental': 'bool' ,
'*x-multifd-channels': 'int',
'*x-multifd-page-count': 'int',
- '*xbzrle-cache-size': 'size' } }
+ '*xbzrle-cache-size': 'size' ,
+ '*uri': 'str'} }
##
# @query-migrate-parameters:
--
2.13.6
- [Qemu-devel] [PATCH 0/6] Improve info migrate output on destination, Juan Quintela, 2017/10/30
- [Qemu-devel] [PATCH 2/6] migration: print features as on off, Juan Quintela, 2017/10/30
- [Qemu-devel] [PATCH 3/6] migration: free addr in the same function that we created it, Juan Quintela, 2017/10/30
- [Qemu-devel] [PATCH 1/6] qio: Make port 0 work for qio, Juan Quintela, 2017/10/30
- [Qemu-devel] [PATCH 4/6] migration: Create uri parameter,
Juan Quintela <=
- [Qemu-devel] [PATCH 5/6] migration: Now set the migration uri, Juan Quintela, 2017/10/30
- [Qemu-devel] [PATCH 6/6] migration: make migrate uri parameter optional, Juan Quintela, 2017/10/30
- Re: [Qemu-devel] [PATCH 0/6] Improve info migrate output on destination, Fam Zheng, 2017/10/30