From 055a1efc7c5a30ca0993720da57ba70179d28c7b Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Mon, 6 Aug 2018 08:53:25 +0200 Subject: libqtest: Remove qtest_qmp_discard_response() & friends qtest_qmp_discard_response(...) is shorthand for qobject_unref(qtest_qmp(...), except it's not actually shorter. Moreover, the presence of these functions encourage sloppy testing. Remove them from libqtest. Add them as macros to the tests that use them, with a TODO comment asking for cleanup. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Message-Id: <20180806065344.7103-5-armbru@redhat.com> Reviewed-by: Thomas Huth --- tests/libqtest.h | 27 --------------------------- 1 file changed, 27 deletions(-) (limited to 'tests/libqtest.h') diff --git a/tests/libqtest.h b/tests/libqtest.h index c1af40106f..3eecd5e9a7 100644 --- a/tests/libqtest.h +++ b/tests/libqtest.h @@ -73,15 +73,6 @@ QTestState *qtest_init_without_qmp_handshake(bool use_oob, */ void qtest_quit(QTestState *s); -/** - * qtest_qmp_discard_response: - * @s: #QTestState instance to operate on. - * @fmt...: QMP message to send to qemu - * - * Sends a QMP message to QEMU and consumes the response. - */ -void qtest_qmp_discard_response(QTestState *s, const char *fmt, ...); - /** * qtest_qmp: * @s: #QTestState instance to operate on. @@ -100,16 +91,6 @@ QDict *qtest_qmp(QTestState *s, const char *fmt, ...); */ void qtest_qmp_send(QTestState *s, const char *fmt, ...); -/** - * qtest_qmpv_discard_response: - * @s: #QTestState instance to operate on. - * @fmt: QMP message to send to QEMU - * @ap: QMP message arguments - * - * Sends a QMP message to QEMU and consumes the response. - */ -void qtest_qmpv_discard_response(QTestState *s, const char *fmt, va_list ap); - /** * qtest_qmpv: * @s: #QTestState instance to operate on. @@ -575,14 +556,6 @@ QDict *qmp(const char *fmt, ...); */ void qmp_send(const char *fmt, ...); -/** - * qmp_discard_response: - * @fmt...: QMP message to send to qemu - * - * Sends a QMP message to QEMU and consumes the response. - */ -void qmp_discard_response(const char *fmt, ...); - /** * qmp_receive: * -- cgit v1.2.3