Message ID | 20190813093047.27948-5-thuth@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | First batch of global_qtest-removement patches for QEMU 4.2 | expand |
On 8/13/19 4:30 AM, Thomas Huth wrote: > The generic libqtest library functions should not use functions that > require the global_qtest variable. > > Signed-off-by: Thomas Huth <thuth@redhat.com> > --- > tests/libqtest.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > Reviewed-by: Eric Blake <eblake@redhat.com>
diff --git a/tests/libqtest.c b/tests/libqtest.c index 3e9245d4c9..d1aead30ed 100644 --- a/tests/libqtest.c +++ b/tests/libqtest.c @@ -1189,9 +1189,10 @@ void qtest_cb_for_every_machine(void (*cb)(const char *machine), QObject *qobj; QString *qstr; const char *mname; + QTestState *qts; - qtest_start("-machine none"); - response = qmp("{ 'execute': 'query-machines' }"); + qts = qtest_init("-machine none"); + response = qtest_qmp(qts, "{ 'execute': 'query-machines' }"); g_assert(response); list = qdict_get_qlist(response, "return"); g_assert(list); @@ -1209,7 +1210,7 @@ void qtest_cb_for_every_machine(void (*cb)(const char *machine), } } - qtest_end(); + qtest_quit(qts); qobject_unref(response); }
The generic libqtest library functions should not use functions that require the global_qtest variable. Signed-off-by: Thomas Huth <thuth@redhat.com> --- tests/libqtest.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)