diff options
| author | Peter Maydell | 2018-12-13 14:41:44 +0100 |
|---|---|---|
| committer | Peter Maydell | 2018-12-13 14:41:44 +0100 |
| commit | c3ec0fa1a8e815ecfec9eabb9c20ee206c313e07 (patch) | |
| tree | 8de8111f4fffb7c3bc3e5b12ad72105c7206cd1c /tests/libqtest.c | |
| parent | Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20181212' into staging (diff) | |
| parent | tests: add oob functional test for test-qmp-cmds (diff) | |
| download | qemu-c3ec0fa1a8e815ecfec9eabb9c20ee206c313e07.tar.gz qemu-c3ec0fa1a8e815ecfec9eabb9c20ee206c313e07.tar.xz qemu-c3ec0fa1a8e815ecfec9eabb9c20ee206c313e07.zip | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-monitor-2018-12-12' into staging
Monitor patches for 2018-12-12
# gpg: Signature made Wed 12 Dec 2018 10:08:15 GMT
# gpg: using RSA key 3870B400EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>"
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653
* remotes/armbru/tags/pull-monitor-2018-12-12:
tests: add oob functional test for test-qmp-cmds
Revert "tests: Add parameter to qtest_init_without_qmp_handshake"
monitor: Remove "x-oob", offer capability "oob" unconditionally
monitor: Suspend monitor instead dropping commands
monitor: avoid potential dead-lock when cleaning up
monitor: prevent inserting new monitors after cleanup
colo: check chardev can switch context
monitor: check if chardev can switch gcontext for OOB
char: add a QEMU_CHAR_FEATURE_GCONTEXT flag
monitor: accept chardev input from iothread
monitor: inline ambiguous helper functions
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
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 75e07e16e7..43be078518 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, use_oob ? ",x-oob=on" : "", + 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 */ |