提交 1c424610 编写于 作者: J Ján Tomko

tests: assume JSON in qemuMonitorTestIO

The QMP monitor only uses a newline to separate lines,
while HMP and the guest agent also use a carriage return.

In preparation to dropping support for testing HMP interaction,
only skip the carriage return if we're dealing with the guest agent,
removing the need to check the 'json' field.
Signed-off-by: NJán Tomko <jtomko@redhat.com>
Reviewed-by: NAndrea Bolognani <abologna@redhat.com>
上级 27f866ba
......@@ -296,7 +296,7 @@ qemuMonitorTestIO(virNetSocketPtr sock,
*/
t1 = test->incoming;
while ((t2 = strstr(t1, "\n")) ||
(!test->json && (t2 = strstr(t1, "\r")))) {
(test->agent && (t2 = strstr(t1, "\r")))) {
*t2 = '\0';
if (qemuMonitorTestProcessCommand(test, t1) < 0) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册