[Qemu-devel] [PATCH v4 09/11] tests: Create migrate-start-postcopy command

Juan Quintela posted 11 patches 7 years, 9 months ago
There is a newer version of this series
[Qemu-devel] [PATCH v4 09/11] tests: Create migrate-start-postcopy command
Posted by Juan Quintela 7 years, 9 months ago
This way, it is like the rest of commands

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 tests/migration-test.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/tests/migration-test.c b/tests/migration-test.c
index c25c9dd7b1..70b3c0870b 100644
--- a/tests/migration-test.c
+++ b/tests/migration-test.c
@@ -436,6 +436,15 @@ static void migrate(QTestState *who, const char *uri)
     QDECREF(rsp);
 }
 
+static void migrate_start_postcopy(QTestState *who)
+{
+    QDict *rsp;
+
+    rsp = wait_command(who, "{ 'execute': 'migrate-start-postcopy' }");
+    g_assert(qdict_haskey(rsp, "return"));
+    QDECREF(rsp);
+}
+
 static void test_migrate_start(QTestState **from, QTestState **to,
                                const char *uri)
 {
@@ -598,7 +607,6 @@ static void test_postcopy(void)
 {
     char *uri = g_strdup_printf("unix:%s/migsocket", tmpfs);
     QTestState *from, *to;
-    QDict *rsp;
 
     test_migrate_start(&from, &to, uri);
 
@@ -620,9 +628,7 @@ static void test_postcopy(void)
 
     wait_for_migration_pass(from);
 
-    rsp = wait_command(from, "{ 'execute': 'migrate-start-postcopy' }");
-    g_assert(qdict_haskey(rsp, "return"));
-    QDECREF(rsp);
+    migrate_start_postcopy(from);
 
     if (!got_stop) {
         qtest_qmp_eventwait(from, "STOP");
-- 
2.14.3


Re: [Qemu-devel] [PATCH v4 09/11] tests: Create migrate-start-postcopy command
Posted by Dr. David Alan Gilbert 7 years, 9 months ago
* Juan Quintela (quintela@redhat.com) wrote:
> This way, it is like the rest of commands
> 
> Signed-off-by: Juan Quintela <quintela@redhat.com>

Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

> ---
>  tests/migration-test.c | 14 ++++++++++----
>  1 file changed, 10 insertions(+), 4 deletions(-)
> 
> diff --git a/tests/migration-test.c b/tests/migration-test.c
> index c25c9dd7b1..70b3c0870b 100644
> --- a/tests/migration-test.c
> +++ b/tests/migration-test.c
> @@ -436,6 +436,15 @@ static void migrate(QTestState *who, const char *uri)
>      QDECREF(rsp);
>  }
>  
> +static void migrate_start_postcopy(QTestState *who)
> +{
> +    QDict *rsp;
> +
> +    rsp = wait_command(who, "{ 'execute': 'migrate-start-postcopy' }");
> +    g_assert(qdict_haskey(rsp, "return"));
> +    QDECREF(rsp);
> +}
> +
>  static void test_migrate_start(QTestState **from, QTestState **to,
>                                 const char *uri)
>  {
> @@ -598,7 +607,6 @@ static void test_postcopy(void)
>  {
>      char *uri = g_strdup_printf("unix:%s/migsocket", tmpfs);
>      QTestState *from, *to;
> -    QDict *rsp;
>  
>      test_migrate_start(&from, &to, uri);
>  
> @@ -620,9 +628,7 @@ static void test_postcopy(void)
>  
>      wait_for_migration_pass(from);
>  
> -    rsp = wait_command(from, "{ 'execute': 'migrate-start-postcopy' }");
> -    g_assert(qdict_haskey(rsp, "return"));
> -    QDECREF(rsp);
> +    migrate_start_postcopy(from);
>  
>      if (!got_stop) {
>          qtest_qmp_eventwait(from, "STOP");
> -- 
> 2.14.3
> 
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK