aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--monitor.c1
-rw-r--r--tests/qmp-test.c7
2 files changed, 8 insertions, 0 deletions
diff --git a/monitor.c b/monitor.c
index 37ca4e7..c49214c 100644
--- a/monitor.c
+++ b/monitor.c
@@ -4339,6 +4339,7 @@ static void handle_qmp_command(JSONMessageParser *parser, GQueue *tokens)
return;
err:
+ /* FIXME overtakes queued in-band commands, wrong when !qmp_is_oob() */
monitor_qmp_respond(mon, NULL, err, NULL);
qobject_unref(req);
}
diff --git a/tests/qmp-test.c b/tests/qmp-test.c
index a7b6ec9..9eb20a1 100644
--- a/tests/qmp-test.c
+++ b/tests/qmp-test.c
@@ -241,6 +241,13 @@ static void test_qmp_oob(void)
unblock_blocked_cmd();
recv_cmd_id(qts, "ib-blocks-1");
recv_cmd_id(qts, "ib-quick-1");
+
+ /* FIXME certain in-band errors overtake slow in-band command */
+ send_cmd_that_blocks(qts, "blocks-2");
+ qtest_async_qmp(qts, "{ 'id': 'err-2' }");
+ recv_cmd_id(qts, NULL);
+ unblock_blocked_cmd();
+ recv_cmd_id(qts, "blocks-2");
cleanup_blocking_cmd();
qtest_quit(qts);