diff options
| author | Peter Xu <peterx@redhat.com> | 2018-10-09 14:27:16 +0800 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2018-12-12 10:28:27 +0100 |
| commit | 192f26a74c57ca2997f6ca8e3a2fd24e943c7918 (patch) | |
| tree | 2236f2da7af78f546004bb0c99ee8e980ed92296 /tests/libqtest.c | |
| parent | 8258292e18c39480b64eba9f3551ab772ce29b5d (diff) | |
| download | qemu-192f26a74c57ca2997f6ca8e3a2fd24e943c7918.zip qemu-192f26a74c57ca2997f6ca8e3a2fd24e943c7918.tar.gz qemu-192f26a74c57ca2997f6ca8e3a2fd24e943c7918.tar.bz2 | |
Revert "tests: Add parameter to qtest_init_without_qmp_handshake"
This reverts commit ddee57e0176f6ab53b13c6c97605b62737a8fd7a.
Meanwhile, revert one line from fa198ad9bdef to make sure
qtest_init_without_qmp_handshake() will only pass in one parameter.
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Peter Xu <peterx@redhat.com>
Message-Id: <20181009062718.1914-5-peterx@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Diffstat (limited to 'tests/libqtest.c')
| -rw-r--r-- | tests/libqtest.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/tests/libqtest.c b/tests/libqtest.c index 225a123..43be078 100644 --- a/tests/libqtest.c +++ b/tests/libqtest.c @@ -187,8 +187,7 @@ static const char *qtest_qemu_binary(void) return qemu_bin; } -QTestState *qtest_init_without_qmp_handshake(bool use_oob, - const char *extra_args) +QTestState *qtest_init_without_qmp_handshake(const char *extra_args) { QTestState *s; int sock, qmpsock, i; @@ -219,12 +218,12 @@ QTestState *qtest_init_without_qmp_handshake(bool use_oob, "-qtest unix:%s,nowait " "-qtest-log %s " "-chardev socket,path=%s,nowait,id=char0 " - "-mon chardev=char0,mode=control%s " + "-mon chardev=char0,mode=control " "-machine accel=qtest " "-display none " "%s", qemu_binary, socket_path, getenv("QTEST_LOG") ? "/dev/fd/2" : "/dev/null", - qmp_socket_path, "", + qmp_socket_path, extra_args ?: ""); g_test_message("starting QEMU: %s", command); @@ -266,7 +265,7 @@ QTestState *qtest_init_without_qmp_handshake(bool use_oob, QTestState *qtest_init(const char *extra_args) { - QTestState *s = qtest_init_without_qmp_handshake(false, extra_args); + QTestState *s = qtest_init_without_qmp_handshake(extra_args); QDict *greeting; /* Read the QMP greeting and then do the handshake */ |