ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tests/machine-none: Make test independent of global_qtest 

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().

Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Thomas Huth 2018-11-13 21:11:13 +01:00
parent a2569b001c
commit ed398a1206
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/machine-none-test.c
View File

@ -75,6 +75,7 @@ static void test_machine_cpu_cli(void)
QDict *response; QDict *response;
const char *arch = qtest_get_arch(); const char *arch = qtest_get_arch();
const char *cpu_model = get_cpu_model_by_arch(arch); const char *cpu_model = get_cpu_model_by_arch(arch);
QTestState *qts;
if (!cpu_model) { if (!cpu_model) {
if (!(!strcmp(arch, "microblaze") || !strcmp(arch, "microblazeel"))) { 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 */ 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")); g_assert(qdict_haskey(response, "return"));
qobject_unref(response); qobject_unref(response);
qtest_quit(global_qtest); qtest_quit(qts);
} }
int main(int argc, char **argv) int main(int argc, char **argv)