openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

tests: Add parameter to qtest_init_without_qmp_handshake 

Allow callers to choose whether to allow OOB support during a test;
for now, all existing callers pass false, but the next patch will
add a new caller.  Also, rewrite the monitor setup to be generic
(using the -qmp shorthand is insufficient for honoring the parameter).

Based on an idea by Peter Xu, in <20180326063901.27425-8-peterx@redhat.com>

Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <20180327013620.1644387-4-eblake@redhat.com>
Tested-by: Christian Borntraeger <borntraeger@de.ibm.com>
Acked-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
This commit is contained in:
Eric Blake 2018-03-26 20:36:19 -05:00
parent be933ffc23
commit ddee57e017
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/libqtest.c
View File

@ -166,7 +166,8 @@ static const char *qtest_qemu_binary(void)
return qemu_bin; return qemu_bin;
} }
QTestState *qtest_init_without_qmp_handshake(const char *extra_args) QTestState *qtest_init_without_qmp_handshake(bool use_oob,
const char *extra_args)
{ {
QTestState *s; QTestState *s;
int sock, qmpsock, i; int sock, qmpsock, i;
@ -199,12 +200,13 @@ QTestState *qtest_init_without_qmp_handshake(const char *extra_args)
command = g_strdup_printf("exec %s " command = g_strdup_printf("exec %s "
"-qtest unix:%s,nowait " "-qtest unix:%s,nowait "
"-qtest-log %s " "-qtest-log %s "
"-qmp unix:%s,nowait " "-chardev socket,path=%s,nowait,id=char0 "
"-mon chardev=char0,mode=control%s "
"-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, use_oob ? ",x-oob=on" : "",
extra_args ?: ""); extra_args ?: "");
execlp("/bin/sh", "sh", "-c", command, NULL); execlp("/bin/sh", "sh", "-c", command, NULL);
exit(1); exit(1);
@ -239,7 +241,7 @@ QTestState *qtest_init_without_qmp_handshake(const char *extra_args)
QTestState *qtest_init(const char *extra_args) QTestState *qtest_init(const char *extra_args)
{ {
QTestState *s = qtest_init_without_qmp_handshake(extra_args); QTestState *s = qtest_init_without_qmp_handshake(false, extra_args);
/* Read the QMP greeting and then do the handshake */ /* Read the QMP greeting and then do the handshake */
qtest_qmp_discard_response(s, ""); qtest_qmp_discard_response(s, "");

7
tests/libqtest.h
View File

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

2
tests/qmp-test.c
View File

@ -81,7 +81,7 @@ static void test_qmp_protocol(void)
QList *capabilities; QList *capabilities;
QTestState *qts; QTestState *qts;
qts = qtest_init_without_qmp_handshake(common_args); qts = qtest_init_without_qmp_handshake(false, common_args);
/* Test greeting */ /* Test greeting */
resp = qtest_qmp_receive(qts); resp = qtest_qmp_receive(qts);