Despite 1ad3c6abc0d67e00b84abaa5527bc64b70ca2205, supplying invalid
arguments to the QEMU process still leaked a /tmp/qtest-*.pid file.
Fix this by reordering the reading and unlinking to before reading from
QMP socket, which relies on a running process.
Cc: Stefan Hajnoczi <stefa...@redhat.com>
Signed-off-by: Andreas Färber <afaer...@suse.de>
---
tests/libqtest.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tests/libqtest.c b/tests/libqtest.c
index c9a4f89..9433782 100644
--- a/tests/libqtest.c
+++ b/tests/libqtest.c
@@ -157,14 +157,14 @@ QTestState *qtest_init(const char *extra_args)
s->irq_level[i] = false;
}
- /* Read the QMP greeting and then do the handshake */
- qtest_qmp_discard_response(s, "");
- qtest_qmp_discard_response(s, "{ 'execute': 'qmp_capabilities' }");
-
s->qemu_pid = read_pid_file(pid_file);
unlink(pid_file);
g_free(pid_file);
+ /* Read the QMP greeting and then do the handshake */
+ qtest_qmp_discard_response(s, "");
+ qtest_qmp_discard_response(s, "{ 'execute': 'qmp_capabilities' }");
+
if (getenv("QTEST_STOP")) {
kill(s->qemu_pid, SIGSTOP);
}
--
1.8.4.5
