[for-4.0,3/5] tests/machine-none: Make test independent of global_qtest

Commit Message

Thomas Huth Dec. 6, 2018, 4:49 p.m. UTC

Apart from using qmp() in one spot, this test does not have any
dependencies to the global_qtest variable, so we can simply get
rid of it here by replacing the qmp() with qtest_qmp().

Signed-off-by: Thomas Huth <[e-mail]>
---
 tests/machine-none-test.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

Comments

Eric Blake Dec. 6, 2018, 6:44 p.m. UTC | #1

On 12/6/18 10:49 AM, Thomas Huth wrote:
> Apart from using qmp() in one spot, this test does not have any
> dependencies to the global_qtest variable, so we can simply get
> rid of it here by replacing the qmp() with qtest_qmp().
> 
> Signed-off-by: Thomas Huth <[e-mail]>
> ---
>   tests/machine-none-test.c | 7 ++++---
>   1 file changed, 4 insertions(+), 3 deletions(-)
> 

Reviewed-by: Eric Blake <[e-mail]>

Patch

diff --git a/tests/machine-none-test.c b/tests/machine-none-test.c
index 2b3b750..4c6d470 100644
--- a/tests/machine-none-test.c
+++ b/tests/machine-none-test.c
@@ -75,6 +75,7 @@  static void test_machine_cpu_cli(void)
     QDict *response;
     const char *arch = qtest_get_arch();
     const char *cpu_model = get_cpu_model_by_arch(arch);
+    QTestState *qts;
 
     if (!cpu_model) {
         if (!(!strcmp(arch, "microblaze") || !strcmp(arch, "microblazeel"))) {
@@ -83,13 +84,13 @@  static void test_machine_cpu_cli(void)
         }
         return; /* TODO: die here to force all targets have a test */
     }
-    global_qtest = qtest_initf("-machine none -cpu '%s'", cpu_model);
+    qts = qtest_initf("-machine none -cpu '%s'", cpu_model);
 
-    response = qmp("{ 'execute': 'quit' }");
+    response = qtest_qmp(qts, "{ 'execute': 'quit' }");
     g_assert(qdict_haskey(response, "return"));
     qobject_unref(response);
 
-    qtest_quit(global_qtest);
+    qtest_quit(qts);
 }
 
 int main(int argc, char **argv)