[V6,22/24] tests/qtest: assert qmp connected

Commit Message

Steven Sistare Jan. 14, 2025, 5:23 p.m. UTC

Assert that qmp_fd is valid when we communicate with the monitor.

Suggested-by: Peter Xu <[e-mail]>
Signed-off-by: Steve Sistare <[e-mail]>
---
 tests/qtest/libqtest.c | 4 ++++
 1 file changed, 4 insertions(+)

Comments

Peter Xu Jan. 14, 2025, 5:30 p.m. UTC | #1

On Tue, Jan 14, 2025 at 09:23:52AM -0800, Steve Sistare wrote:
> Assert that qmp_fd is valid when we communicate with the monitor.
> 
> Suggested-by: Peter Xu <[e-mail]>
> Signed-off-by: Steve Sistare <[e-mail]>

Reviewed-by: Peter Xu <[e-mail]>

Patch

diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqtest.c
index b1e0df9..812b7e8 100644
--- a/tests/qtest/libqtest.c
+++ b/tests/qtest/libqtest.c
@@ -788,6 +788,7 @@  QDict *qtest_qmp_receive(QTestState *s)
 
 QDict *qtest_qmp_receive_dict(QTestState *s)
 {
+    g_assert(s->qmp_fd >= 0);
     return qmp_fd_receive(s->qmp_fd);
 }
 
@@ -815,12 +816,14 @@  int qtest_socket_server(const char *socket_path)
 void qtest_qmp_vsend_fds(QTestState *s, int *fds, size_t fds_num,
                          const char *fmt, va_list ap)
 {
+    g_assert(s->qmp_fd >= 0);
     qmp_fd_vsend_fds(s->qmp_fd, fds, fds_num, fmt, ap);
 }
 #endif
 
 void qtest_qmp_vsend(QTestState *s, const char *fmt, va_list ap)
 {
+    g_assert(s->qmp_fd >= 0);
     qmp_fd_vsend(s->qmp_fd, fmt, ap);
 }
 
@@ -881,6 +884,7 @@  void qtest_qmp_send_raw(QTestState *s, const char *fmt, ...)
 {
     va_list ap;
 
+    g_assert(s->qmp_fd >= 0);
     va_start(ap, fmt);
     qmp_fd_vsend_raw(s->qmp_fd, fmt, ap);
     va_end(ap);