Commit 6bb87be8 authored by Thomas Huth's avatar Thomas Huth Committed by Dr. David Alan Gilbert
Browse files

libqtest: Ignore QMP events when parsing the response for HMP commands 



When running certain HMP commands (like "device_del") via QMP, we
can sometimes get a QMP event in the response first, so that the
"g_assert(ret)" statement in qtest_hmp() triggers and the test
fails. Fix this by ignoring such QMP events while looking for the
real return value from QMP.

Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
Message-Id: <1490860207-8302-2-git-send-email-thuth@redhat.com>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
Signed-off-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
  Added note to qtest_hmp/qtest_hmpv's header description to say
  it discards events
parent b7da97ee

tests/libqtest.c

+6 −0
Original line number Diff line number Diff line
@@ -588,6 +588,12 @@ char *qtest_hmpv(QTestState *s, const char *fmt, va_list ap) 
                     " 'arguments': {'command-line': %s}}",

                     cmd);

    ret = g_strdup(qdict_get_try_str(resp, "return"));

    while (ret == NULL && qdict_get_try_str(resp, "event")) {

        /* Ignore asynchronous QMP events */

        QDECREF(resp);

        resp = qtest_qmp_receive(s);

        ret = g_strdup(qdict_get_try_str(resp, "return"));

    }

    g_assert(ret);

    QDECREF(resp);

    g_free(cmd);

tests/libqtest.h

+3 −1
Original line number Diff line number Diff line
@@ -132,11 +132,12 @@ void qtest_qmp_eventwait(QTestState *s, const char *event); 
QDict *qtest_qmp_eventwait_ref(QTestState *s, const char *event);



/**

 * qtest_hmpv:

 * qtest_hmp:

 * @s: #QTestState instance to operate on.

 * @fmt...: HMP command to send to QEMU

 *

 * Send HMP command to QEMU via QMP's human-monitor-command.

 * QMP events are discarded.

 *

 * Returns: the command's output.  The caller should g_free() it.

 */
@@ -149,6 +150,7 @@ char *qtest_hmp(QTestState *s, const char *fmt, ...); 
 * @ap: HMP command arguments

 *

 * Send HMP command to QEMU via QMP's human-monitor-command.

 * QMP events are discarded.

 *

 * Returns: the command's output.  The caller should g_free() it.

 */