[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH for-3.0 5/9] tests: allow migrate() to take extr
From: |
Dr. David Alan Gilbert |
Subject: |
Re: [Qemu-devel] [PATCH for-3.0 5/9] tests: allow migrate() to take extra flags |
Date: |
Thu, 5 Jul 2018 11:18:11 +0100 |
User-agent: |
Mutt/1.10.0 (2018-05-17) |
* Peter Xu (address@hidden) wrote:
> For example, we can pass in '"resume": true' to resume a migration.
>
> Signed-off-by: Peter Xu <address@hidden>
OK, it's a little odd, I wondered whether it would be better just to
pass the whole arguments string in, but that makes it more work for hte
claler to do the formatting, so:
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
> ---
> tests/migration-test.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/tests/migration-test.c b/tests/migration-test.c
> index 2155869b96..af82a04789 100644
> --- a/tests/migration-test.c
> +++ b/tests/migration-test.c
> @@ -337,14 +337,14 @@ static void migrate_set_capability(QTestState *who,
> const char *capability,
> qobject_unref(rsp);
> }
>
> -static void migrate(QTestState *who, const char *uri)
> +static void migrate(QTestState *who, const char *uri, const char *extra)
> {
> QDict *rsp;
> gchar *cmd;
>
> cmd = g_strdup_printf("{ 'execute': 'migrate',"
> - "'arguments': { 'uri': '%s' } }",
> - uri);
> + " 'arguments': { 'uri': '%s' %s } }",
> + uri, extra ? extra : "");
> rsp = qtest_qmp(who, cmd);
> g_free(cmd);
> g_assert(qdict_haskey(rsp, "return"));
> @@ -533,7 +533,7 @@ static void migrate_postcopy_prepare(QTestState
> **from_ptr,
> /* Wait for the first serial output from the source */
> wait_for_serial("src_serial");
>
> - migrate(from, uri);
> + migrate(from, uri, NULL);
> g_free(uri);
>
> wait_for_migration_pass(from);
> @@ -573,7 +573,7 @@ static void test_baddest(void)
> bool failed;
>
> test_migrate_start(&from, &to, "tcp:0:0", true);
> - migrate(from, "tcp:0:0");
> + migrate(from, "tcp:0:0", NULL);
> do {
> rsp = wait_command(from, "{ 'execute': 'query-migrate' }");
> rsp_return = qdict_get_qdict(rsp, "return");
> @@ -615,7 +615,7 @@ static void test_precopy_unix(void)
> /* Wait for the first serial output from the source */
> wait_for_serial("src_serial");
>
> - migrate(from, uri);
> + migrate(from, uri, NULL);
>
> wait_for_migration_pass(from);
>
> --
> 2.17.1
>
--
Dr. David Alan Gilbert / address@hidden / Manchester, UK