diff options
| author | Thomas Huth <thuth@redhat.com> | 2017-03-30 09:50:05 +0200 |
|---|---|---|
| committer | Dr. David Alan Gilbert <dgilbert@redhat.com> | 2017-04-26 14:42:31 +0100 |
| commit | 6bb87be8938691fa5cf989b7517d7d2084b8c141 (patch) | |
| tree | 1d828438e53ab425ca86cc8e7ed14d5635fa1f68 /tests/libqtest.h | |
| parent | b7da97eef74bf834be244de0796ccb01db3985c9 (diff) | |
| download | qemu-6bb87be8938691fa5cf989b7517d7d2084b8c141.zip qemu-6bb87be8938691fa5cf989b7517d7d2084b8c141.tar.gz qemu-6bb87be8938691fa5cf989b7517d7d2084b8c141.tar.bz2 | |
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: Thomas Huth <thuth@redhat.com>
Message-Id: <1490860207-8302-2-git-send-email-thuth@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Added note to qtest_hmp/qtest_hmpv's header description to say
it discards events
Diffstat (limited to 'tests/libqtest.h')
| -rw-r--r-- | tests/libqtest.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/libqtest.h b/tests/libqtest.h index 2c9962d..ee23744 100644 --- a/tests/libqtest.h +++ b/tests/libqtest.h @@ -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. */ |