[Qemu-devel] [PULL 02/19] migration-test: rename parameter to parameter_int
We would need _str ones on the next patch.
Signed-off-by: Juan Quintela
Reviewed-by: Wei Yang
Signed-off-by: Juan Quintela
---
tests/migration-test.c | 55 +-
1 file changed, 28 insertions(+), 27 deletions(-)
diff --git a/tests/migration-test.c b/tests/migration-test.c
index b6434628e1..a4feb9545d 100644
--- a/tests/migration-test.c
+++ b/tests/migration-test.c
@@ -398,7 +398,8 @@ static char *migrate_get_socket_address(QTestState *who,
const char *parameter)
return result;
}
-static long long migrate_get_parameter(QTestState *who, const char *parameter)
+static long long migrate_get_parameter_int(QTestState *who,
+ const char *parameter)
{
QDict *rsp;
long long result;
@@ -409,17 +410,17 @@ static long long migrate_get_parameter(QTestState *who,
const char *parameter)
return result;
}
-static void migrate_check_parameter(QTestState *who, const char *parameter,
-long long value)
+static void migrate_check_parameter_int(QTestState *who, const char *parameter,
+long long value)
{
long long result;
-result = migrate_get_parameter(who, parameter);
+result = migrate_get_parameter_int(who, parameter);
g_assert_cmpint(result, ==, value);
}
-static void migrate_set_parameter(QTestState *who, const char *parameter,
- long long value)
+static void migrate_set_parameter_int(QTestState *who, const char *parameter,
+ long long value)
{
QDict *rsp;
@@ -429,7 +430,7 @@ static void migrate_set_parameter(QTestState *who, const
char *parameter,
parameter, value);
g_assert(qdict_haskey(rsp, "return"));
qobject_unref(rsp);
-migrate_check_parameter(who, parameter, value);
+migrate_check_parameter_int(who, parameter, value);
}
static void migrate_pause(QTestState *who)
@@ -681,7 +682,7 @@ static void deprecated_set_downtime(QTestState *who, const
double value)
" 'arguments': { 'value': %f } }", value);
g_assert(qdict_haskey(rsp, "return"));
qobject_unref(rsp);
-migrate_check_parameter(who, "downtime-limit", value * 1000);
+migrate_check_parameter_int(who, "downtime-limit", value * 1000);
}
static void deprecated_set_speed(QTestState *who, long long value)
@@ -692,7 +693,7 @@ static void deprecated_set_speed(QTestState *who, long long
value)
"'arguments': { 'value': %lld } }", value);
g_assert(qdict_haskey(rsp, "return"));
qobject_unref(rsp);
-migrate_check_parameter(who, "max-bandwidth", value);
+migrate_check_parameter_int(who, "max-bandwidth", value);
}
static void deprecated_set_cache_size(QTestState *who, long long value)
@@ -703,7 +704,7 @@ static void deprecated_set_cache_size(QTestState *who, long
long value)
"'arguments': { 'value': %lld } }", value);
g_assert(qdict_haskey(rsp, "return"));
qobject_unref(rsp);
-migrate_check_parameter(who, "xbzrle-cache-size", value);
+migrate_check_parameter_int(who, "xbzrle-cache-size", value);
}
static void test_deprecated(void)
@@ -738,8 +739,8 @@ static int migrate_postcopy_prepare(QTestState **from_ptr,
* quickly, but that it doesn't complete precopy even on a slow
* machine, so also set the downtime.
*/
-migrate_set_parameter(from, "max-bandwidth", 1);
-migrate_set_parameter(from, "downtime-limit", 1);
+migrate_set_parameter_int(from, "max-bandwidth", 1);
+migrate_set_parameter_int(from, "downtime-limit", 1);
/* Wait for the first serial output from the source */
wait_for_serial("src_serial");
@@ -790,7 +791,7 @@ static void test_postcopy_recovery(void)
}
/* Turn postcopy speed down, 4K/s is slow enough on any machines */
-migrate_set_parameter(from, "max-postcopy-bandwidth", 4096);
+migrate_set_parameter_int(from, "max-postcopy-bandwidth", 4096);
/* Now we start the postcopy */
migrate_postcopy_start(from, to);
@@ -831,7 +832,7 @@ static void test_postcopy_recovery(void)
g_free(uri);
/* Restore the postcopy bandwidth to unlimited */
-migrate_set_parameter(from, "max-postcopy-bandwidth", 0);
+migrate_set_parameter_int(from, "max-postcopy-bandwidth", 0);
migrate_postcopy_complete(from, to);
}
@@ -877,9 +878,9 @@ static void test_precopy_unix(void)
* machine, so also set the downtime.
*/
/* 1 ms should make it not converge*/
-migrate_set_parameter(from, "downtime-limit", 1);
+migrate_set_parameter_int(from, "downtime-limit", 1);
/* 1GB/s */
-migrate_set_parameter(from, "max-bandwidth", 10);
+migrate_set_parameter_int(from, "max-bandwidth", 10);
/* Wait for the first serial output from the source */
[Qemu-devel] [PULL 02/19] migration-test: rename parameter to parameter_int
We would need _str ones on the next patch.
Signed-off-by: Juan Quintela
Reviewed-by: Wei Yang
Signed-off-by: Juan Quintela
---
tests/migration-test.c | 55 +-
1 file changed, 28 insertions(+), 27 deletions(-)
diff --git a/tests/migration-test.c b/tests/migration-test.c
index b6434628e1..a4feb9545d 100644
--- a/tests/migration-test.c
+++ b/tests/migration-test.c
@@ -398,7 +398,8 @@ static char *migrate_get_socket_address(QTestState *who,
const char *parameter)
return result;
}
-static long long migrate_get_parameter(QTestState *who, const char *parameter)
+static long long migrate_get_parameter_int(QTestState *who,
+ const char *parameter)
{
QDict *rsp;
long long result;
@@ -409,17 +410,17 @@ static long long migrate_get_parameter(QTestState *who,
const char *parameter)
return result;
}
-static void migrate_check_parameter(QTestState *who, const char *parameter,
-long long value)
+static void migrate_check_parameter_int(QTestState *who, const char *parameter,
+long long value)
{
long long result;
-result = migrate_get_parameter(who, parameter);
+result = migrate_get_parameter_int(who, parameter);
g_assert_cmpint(result, ==, value);
}
-static void migrate_set_parameter(QTestState *who, const char *parameter,
- long long value)
+static void migrate_set_parameter_int(QTestState *who, const char *parameter,
+ long long value)
{
QDict *rsp;
@@ -429,7 +430,7 @@ static void migrate_set_parameter(QTestState *who, const
char *parameter,
parameter, value);
g_assert(qdict_haskey(rsp, "return"));
qobject_unref(rsp);
-migrate_check_parameter(who, parameter, value);
+migrate_check_parameter_int(who, parameter, value);
}
static void migrate_pause(QTestState *who)
@@ -681,7 +682,7 @@ static void deprecated_set_downtime(QTestState *who, const
double value)
" 'arguments': { 'value': %f } }", value);
g_assert(qdict_haskey(rsp, "return"));
qobject_unref(rsp);
-migrate_check_parameter(who, "downtime-limit", value * 1000);
+migrate_check_parameter_int(who, "downtime-limit", value * 1000);
}
static void deprecated_set_speed(QTestState *who, long long value)
@@ -692,7 +693,7 @@ static void deprecated_set_speed(QTestState *who, long long
value)
"'arguments': { 'value': %lld } }", value);
g_assert(qdict_haskey(rsp, "return"));
qobject_unref(rsp);
-migrate_check_parameter(who, "max-bandwidth", value);
+migrate_check_parameter_int(who, "max-bandwidth", value);
}
static void deprecated_set_cache_size(QTestState *who, long long value)
@@ -703,7 +704,7 @@ static void deprecated_set_cache_size(QTestState *who, long
long value)
"'arguments': { 'value': %lld } }", value);
g_assert(qdict_haskey(rsp, "return"));
qobject_unref(rsp);
-migrate_check_parameter(who, "xbzrle-cache-size", value);
+migrate_check_parameter_int(who, "xbzrle-cache-size", value);
}
static void test_deprecated(void)
@@ -738,8 +739,8 @@ static int migrate_postcopy_prepare(QTestState **from_ptr,
* quickly, but that it doesn't complete precopy even on a slow
* machine, so also set the downtime.
*/
-migrate_set_parameter(from, "max-bandwidth", 1);
-migrate_set_parameter(from, "downtime-limit", 1);
+migrate_set_parameter_int(from, "max-bandwidth", 1);
+migrate_set_parameter_int(from, "downtime-limit", 1);
/* Wait for the first serial output from the source */
wait_for_serial("src_serial");
@@ -790,7 +791,7 @@ static void test_postcopy_recovery(void)
}
/* Turn postcopy speed down, 4K/s is slow enough on any machines */
-migrate_set_parameter(from, "max-postcopy-bandwidth", 4096);
+migrate_set_parameter_int(from, "max-postcopy-bandwidth", 4096);
/* Now we start the postcopy */
migrate_postcopy_start(from, to);
@@ -831,7 +832,7 @@ static void test_postcopy_recovery(void)
g_free(uri);
/* Restore the postcopy bandwidth to unlimited */
-migrate_set_parameter(from, "max-postcopy-bandwidth", 0);
+migrate_set_parameter_int(from, "max-postcopy-bandwidth", 0);
migrate_postcopy_complete(from, to);
}
@@ -877,9 +878,9 @@ static void test_precopy_unix(void)
* machine, so also set the downtime.
*/
/* 1 ms should make it not converge*/
-migrate_set_parameter(from, "downtime-limit", 1);
+migrate_set_parameter_int(from, "downtime-limit", 1);
/* 1GB/s */
-migrate_set_parameter(from, "max-bandwidth", 10);
+migrate_set_parameter_int(from, "max-bandwidth", 10);
/* Wait for the first serial output from the source */
