mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "tests: Add parameter to qtest_init_without_qmp_handshake"

Browse Source 
This reverts commit ddee57e017.

Meanwhile, revert one line from fa198ad9bd 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>
This commit is contained in:
Peter Xu 2018-10-09 14:27:16 +08:00 committed by Markus Armbruster
parent 8258292e18
commit 192f26a74c
3 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/libqtest.c
View File

@ -187,8 +187,7 @@ static const char *qtest_qemu_binary(void)
return qemu_bin; return qemu_bin;
} }
QTestState *qtest_init_without_qmp_handshake(bool use_oob, QTestState *qtest_init_without_qmp_handshake(const char *extra_args)
const char *extra_args)
{ {
QTestState *s; QTestState *s;
int sock, qmpsock, i; int sock, qmpsock, i;
@ -219,12 +218,12 @@ QTestState *qtest_init_without_qmp_handshake(bool use_oob,
"-qtest unix:%s,nowait " "-qtest unix:%s,nowait "
"-qtest-log %s " "-qtest-log %s "
"-chardev socket,path=%s,nowait,id=char0 " "-chardev socket,path=%s,nowait,id=char0 "
"-mon chardev=char0,mode=control%s " "-mon chardev=char0,mode=control "
"-machine accel=qtest " "-machine accel=qtest "
"-display none " "-display none "
"%s", qemu_binary, socket_path, "%s", qemu_binary, socket_path,
getenv("QTEST_LOG") ? "/dev/fd/2" : "/dev/null", getenv("QTEST_LOG") ? "/dev/fd/2" : "/dev/null",
qmp_socket_path, "", qmp_socket_path,
extra_args ?: ""); extra_args ?: "");
g_test_message("starting QEMU: %s", command); 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 *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; QDict *greeting;
/* Read the QMP greeting and then do the handshake */ /* Read the QMP greeting and then do the handshake */

4
tests/libqtest.h
View File

@ -55,14 +55,12 @@ QTestState *qtest_init(const char *extra_args);
/** /**
* qtest_init_without_qmp_handshake: * qtest_init_without_qmp_handshake:
* @use_oob: true to have the server advertise OOB support
* @extra_args: other arguments to pass to QEMU. CAUTION: these * @extra_args: other arguments to pass to QEMU. CAUTION: these
* arguments are subject to word splitting and shell evaluation. * arguments are subject to word splitting and shell evaluation.
* *
* Returns: #QTestState instance. * Returns: #QTestState instance.
*/ */
QTestState *qtest_init_without_qmp_handshake(bool use_oob, QTestState *qtest_init_without_qmp_handshake(const char *extra_args);
const char *extra_args);
/** /**
* qtest_quit: * qtest_quit:

4
tests/qmp-test.c
View File

@ -108,7 +108,7 @@ static void test_qmp_protocol(void)
QList *capabilities; QList *capabilities;
QTestState *qts; QTestState *qts;
qts = qtest_init_without_qmp_handshake(false, common_args); qts = qtest_init_without_qmp_handshake(common_args);
/* Test greeting */ /* Test greeting */
resp = qtest_qmp_receive(qts); resp = qtest_qmp_receive(qts);
@ -219,7 +219,7 @@ static void test_qmp_oob(void)
QList *capabilities; QList *capabilities;
QString *qstr; QString *qstr;
qts = qtest_init_without_qmp_handshake(true, common_args); qts = qtest_init_without_qmp_handshake(common_args);
/* Check the greeting message. */ /* Check the greeting message. */
resp = qtest_qmp_receive(qts); resp = qtest_qmp_receive(qts);