Eric Blake <ebl...@redhat.com> writes: > On 07/27/2018 10:13 AM, Markus Armbruster wrote: >> The functions to receive messages are called qtest_qmp_receive() and >> qmp_receive(), qmp_fd_receive(). The ones to send messages are called >> qtest_async_qmp(), qtest_async_qmpv(), qmp_async(), qmp_fd_send(), >> qmp_fd_sendv(). Inconsistent. Rename the *_async* ones to >> qmp_send(), qtest_qmp_send(), qtest_qmp_vsend(). Rename >> qmp_fd_sendv() to qmp_fd_vsend(). >> >> Signed-off-by: Markus Armbruster <arm...@redhat.com> >> Reviewed-by: Philippe Mathieu-Daudé <f4...@amsat.org> >> --- > > Reviewed-by: Eric Blake <ebl...@redhat.com> > >> @@ -1592,8 +1592,8 @@ static void test_atapi_tray(void) >> atapi_wait_tray(false); >> /* Remove media */ >> - qmp_async("{'execute': 'blockdev-open-tray', " >> - "'arguments': {'id': 'cd0'}}"); >> + qmp_send("{'execute': 'blockdev-open-tray'," >> + " 'arguments': {'id': 'cd0'}}"); > > Could perhaps fit in one line now, but I won't insist.
I tried, it doesn't fit.