From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56198) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fb1L8-0002Ii-Hk for qemu-devel@nongnu.org; Thu, 05 Jul 2018 06:18:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fb1L5-0008Hd-DC for qemu-devel@nongnu.org; Thu, 05 Jul 2018 06:18:18 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:58060 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fb1L5-0008F3-74 for qemu-devel@nongnu.org; Thu, 05 Jul 2018 06:18:15 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9E1C485627 for ; Thu, 5 Jul 2018 10:18:14 +0000 (UTC) Date: Thu, 5 Jul 2018 11:18:11 +0100 From: "Dr. David Alan Gilbert" Message-ID: <20180705101811.GG2538@work-vm> References: <20180705031755.3254-1-peterx@redhat.com> <20180705031755.3254-6-peterx@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20180705031755.3254-6-peterx@redhat.com> Subject: Re: [Qemu-devel] [PATCH for-3.0 5/9] tests: allow migrate() to take extra flags List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Xu Cc: qemu-devel@nongnu.org, Juan Quintela * Peter Xu (peterx@redhat.com) wrote: > For example, we can pass in '"resume": true' to resume a migration. > > Signed-off-by: Peter Xu 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 > --- > 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 / dgilbert@redhat.com / Manchester, UK